Ajout variable manquante HV_FONTS_DIR

[hvlinux.git] / stage3 / cis-squirrelmail

diff --git a/stage3/cis-squirrelmail b/stage3/cis-squirrelmail
index 31c5363..aa699e2 100755 (executable)
--- a/stage3/cis-squirrelmail
+++ b/stage3/cis-squirrelmail
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -7,21 +9,20 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-mv ${LFS_TMP}/${1} /srv/www/htdocs/squirrelmail &&
-chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/www/htdocs/squirrelmail &&
+mv ${LFS_TMP}/${1} /srv/www/htdocs/squirrelmail
+chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/www/htdocs/squirrelmail
 
-mkdir -v -p /srv/squirrelmail/{data,attach} &&
-chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/squirrelmail &&
-chmod -v 0730 /srv/squirrelmail/attach &&
+mkdir -v -p /srv/squirrelmail/{data,attach}
+chown -v -R ${APACHE_USER}:${APACHE_USER} /srv/squirrelmail
+chmod -v 0730 /srv/squirrelmail/attach
 
-cp /srv/www/htdocs/squirrelmail/config/config_default.php /srv/www/htdocs/squirrelmail/config/config.php &&
+cp /srv/www/htdocs/squirrelmail/config/config_default.php /srv/www/htdocs/squirrelmail/config/config.php
 
 sed -i -e "s!\(\$data_dir .* =\).*!\1 \'/srv/squirrelmail/data/\';!g" \
-    /srv/www/htdocs/squirrelmail/config/config.php &&
+    /srv/www/htdocs/squirrelmail/config/config.php
 sed -i -e "s!\(\$attachment_dir .* =\).*!\1 \'/srv/squirrelmail/attach/\';!g" \
     /srv/www/htdocs/squirrelmail/config/config.php
  
-# Return last error
 exit $?