Fix on debian package

This commit is contained in:
Laurent Destailleur 2010-01-06 12:49:26 +00:00
parent a23f4c9793
commit 9e784dccdf
3 changed files with 7 additions and 7 deletions

View File

@ -18,7 +18,7 @@ set -e
db_version 2.0 db_version 2.0
echo Run the configuration script echo Run the config script
# Rotate old configuration # Rotate old configuration
if [ "$1" = "reconfigure" ] ; then if [ "$1" = "reconfigure" ] ; then

View File

@ -69,15 +69,15 @@ case "$1" in
#db_reset "dolibarr/webserver" #db_reset "dolibarr/webserver"
# Get the web server type (use dbget for interactive mode). # Get the web server type (use db_get for interactive mode).
# db_get "dolibarr/webserver" # Read value for webserver. # db_get "dolibarr/webserver" # Read value for webserver.
# webserver="$RET" # webserver="$RET"
webserver="Both"
case $webserver in case $webserver in
Apache) webservers="apache2" ;; Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;; Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;; Both) webservers="apache2 apache2-ssl" ;;
*) webservers="" ;; *) webservers="apache2 apache2-ssl" ;;
esac esac
# Define variable phpver and phpini # Define variable phpver and phpini
. /usr/share/wwwconfig-common/php.get . /usr/share/wwwconfig-common/php.get

View File

@ -21,9 +21,9 @@ set -e
db_version 2.0 db_version 2.0
#echo "postrm db_get dolibarr/webserver" #echo "postrm db_get dolibarr/webserver"
set +e
# We disable set -e to avoid premature end of script if error # We disable set -e to avoid premature end of script if error
db_get "dolibarr/webserver" || true set +e
#db_get "dolibarr/webserver" || true
set -e set -e
export webserver="$RET" export webserver="$RET"