From e83c39b5df06a13d9828fdbc003e3a2103e920c0 Mon Sep 17 00:00:00 2001 From: Rod Roark Date: Fri, 5 Aug 2011 12:40:02 -0700 Subject: [PATCH] Improved robustness of updating sqlconf.php. --- contrib/util/restore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/util/restore b/contrib/util/restore index 95027ba8c..096f704a3 100755 --- a/contrib/util/restore +++ b/contrib/util/restore @@ -555,9 +555,9 @@ if [ $CHANGES -gt 0 ]; then dlg_info "Modifying $OEDIR/sites/$SITEID/sqlconf.php ..." cd $OEDIR/sites/$SITEID mv sqlconf.php sqlconf.php.old - sed "s^dbase\t= ['\"].*['\"]^dbase\t= '$OEDBNAME'^" sqlconf.php.old | \ - sed "s^login\t= ['\"].*['\"]^login\t= '$OEDBUSER'^" | \ - sed "s^pass\t= ['\"].*['\"]^pass\t= '$OEDBPASS'^" > sqlconf.php + sed "s^dbase\s*=\s*['\"].*['\"]^dbase\t= '$OEDBNAME'^" sqlconf.php.old | \ + sed "s^login\s*=\s*['\"].*['\"]^login\t= '$OEDBUSER'^" | \ + sed "s^pass\s*=\s*['\"].*['\"]^pass\t= '$OEDBPASS'^" > sqlconf.php # # Logic to fix the path to ws_server.pl in includes/config.php was removed. # Not gonna worry about this because SL is deprecated, the old logic was not -- 2.11.4.GIT