瀏覽代碼

Avoid duplicate a2en.
No pass into log.

Laurent Destailleur 11 年之前
父節點
當前提交
70c262a99f
共有 2 個文件被更改,包括 10 次插入8 次删除
  1. 6 5
      build/debian/dolibarr.postinst
  2. 4 3
      build/debian/dolibarr.postrm

+ 6 - 5
build/debian/dolibarr.postinst

@@ -41,11 +41,6 @@ enable_install_upgrade_wizard() {
 }
 
 apache_install() {
-	# Apache 2 setup
-	if which a2enmod >/dev/null 2>&1 ;then
-		a2enmod alias
-	fi
-
 	webserver=$1
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
@@ -92,6 +87,12 @@ case "$1" in
 		else
 			echo This is not a first install
 		fi
+
+		# Apache 2 setup
+		if which a2enmod >/dev/null 2>&1 ;then
+			a2enmod alias
+		fi
+		
 		apache_install
 		lighttpd_install
 		

+ 4 - 3
build/debian/dolibarr.postrm

@@ -177,18 +177,19 @@ case "$1" in
 			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
-
+			mysqlcmdnopass="mysql $hostopt -u $dbadmin"
+			
 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi