From 9e784dccdf50416ec60814eea35448006ff0ad88 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Wed, 6 Jan 2010 12:49:26 +0000 Subject: [PATCH] Fix on debian package --- build/deb/config | 2 +- build/deb/postinst | 6 +++--- build/deb/postrm | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/deb/config b/build/deb/config index 0213a9a9472..bec2d02cc52 100644 --- a/build/deb/config +++ b/build/deb/config @@ -18,7 +18,7 @@ set -e db_version 2.0 -echo Run the configuration script +echo Run the config script # Rotate old configuration if [ "$1" = "reconfigure" ] ; then diff --git a/build/deb/postinst b/build/deb/postinst index 41fd91c9b60..4b4ed0a5607 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -69,15 +69,15 @@ case "$1" in #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. # webserver="$RET" - webserver="Both" + case $webserver in Apache) webservers="apache2" ;; Apache-SSL) webservers="apache2-ssl" ;; Both) webservers="apache2 apache2-ssl" ;; - *) webservers="" ;; + *) webservers="apache2 apache2-ssl" ;; esac # Define variable phpver and phpini . /usr/share/wwwconfig-common/php.get diff --git a/build/deb/postrm b/build/deb/postrm index d2e4613e1e0..8c28812acdb 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -21,9 +21,9 @@ set -e db_version 2.0 #echo "postrm db_get dolibarr/webserver" -set +e # 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 export webserver="$RET" @@ -32,7 +32,7 @@ case $webserver in Apache) webservers="apache2" ;; Apache-SSL) webservers="apache2-ssl" ;; Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; esac export includefile=/etc/dolibarr/apache.conf -- GitLab