Merge pull request #510 from vpodzime/master-fatal_scriptlets

Set -e in package scriptlets

Author: vpodzime

packaging/common/cfengine-hub/postinstall.sh

@@ -187,15 +187,14 @@ EOHIPPUS
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "(echo '/cf_promises_*'; echo '.*.sw[po]'; echo '*~'; echo '\\#*#') >.gitignore")
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT add .gitignore")
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT commit -m 'Ignore cf_promise_*'")
-  (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT add *")
+  (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT add *") || true "Ignoring warning about ignored files not being added"
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT commit -m 'Initial pristine masterfiles'")
 
   (cd $DCWORKDIR/ && su $MP_APACHE_USER -c "$GIT clone --no-hardlinks --bare $DCWORKDIR/masterfiles_staging $DCWORKDIR/masterfiles.git")
   find "$DCWORKDIR/masterfiles.git" -type d -exec chmod 700 {} \;
   find "$DCWORKDIR/masterfiles.git" -type f -exec chmod 600 {} \;
 
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT branch CF_WORKING_BRANCH")
-  (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT remote rm origin")
   (cd $DCWORKDIR/masterfiles_staging && su $MP_APACHE_USER -c "$GIT remote add origin $DCWORKDIR/masterfiles.git")
 
   if [ ! -f /usr/bin/curl ]; then
@@ -265,8 +264,7 @@ esac
 
 if [ -f "$MAN_CONFIG" ];
 then
-  MAN=`cat "$MAN_CONFIG"| grep cfengine`
-  if [ -z "$MAN" ]; then
+  if grep cfengine "$MAN_CONFIG" >/dev/null; then
     echo "$MAN_PATH     $PREFIX/share/man" >> "$MAN_CONFIG"
   fi
 fi
@@ -341,8 +339,7 @@ generate_new_postgres_conf() {
   # Otherwise, we use a shared_buffers equal to 25% of total memory
   total=`cat /proc/meminfo |grep "^MemTotal:.*[0-9]\+ kB"|awk '{print $2}'`
 
-  echo "$total" | grep -q '^[0-9]\+$'
-  if [ $? -ne 0 ] ;then
+  if ! echo "$total" | grep -q '^[0-9]\+$' >/dev/null; then
     cf_console echo "Error calculating total memory for setting postgresql shared_buffers";
   else
     upper=$(( 64 * 1024 * 1024 ))  #in KB
@@ -573,6 +570,7 @@ migrate_db_using_dump_file() {
 }
 
 if is_upgrade && [ -d "$BACKUP_DIR/data" ]; then
+  set +e              # this block has its own error detection/handling
   # DEBUG variable controls which of migration methods fail:
   # 0 - do nothing special (usually pg_upgrade, which is first method, succeeds)
   # 1 - fail first method (so we get a chance to run second method, migration via pipe)
@@ -657,6 +655,7 @@ if is_upgrade && [ -d "$BACKUP_DIR/data" ]; then
     cf_console echo "And now installation will proceed with clean (empty) database"
     (cd /tmp && su cfpostgres -c "$PREFIX/bin/initdb -D $PREFIX/state/pg/data")
   fi
+  set -e
 fi
 
 (cd /tmp && su cfpostgres -c "$PREFIX/bin/pg_ctl -w -D $PREFIX/state/pg/data -l /var/log/postgresql.log start")
@@ -688,18 +687,23 @@ then
     cf_console echo "Database migration also failed for the above reason. Backups are in $PREFIX/state/pg/*.sql.gz"
   fi
 else
-  (cd /tmp && su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfdb")
-  (cd /tmp && su cfpostgres -c "$PREFIX/bin/createuser -S -D -R -w $MP_APACHE_USER")
-  (cd /tmp && su cfpostgres -c "$PREFIX/bin/createuser -d -a -w root")
-  (cd /tmp && su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfmp")
-  (cd /tmp && su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfsettings")
+  (
+    cd /tmp
+    set +e
+    su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfdb"
+    su cfpostgres -c "$PREFIX/bin/createuser -S -D -R -w $MP_APACHE_USER"
+    su cfpostgres -c "$PREFIX/bin/createuser -d -a -w root"
+    su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfmp"
+    su cfpostgres -c "$PREFIX/bin/createdb -E SQL_ASCII --lc-collate=C --lc-ctype=C -T template0 cfsettings"
+    exit 0
+  )
 
   # Create the cfengine mission portal postgres user
   (cd /tmp && su cfpostgres -c "$PREFIX/bin/psql cfmp" < $PREFIX/share/GUI/phpcfenginenova/create_cfmppostgres_user.sql)
 
   # Ensure cfpostgres can read the sql files it will import. And that they are
   # restored to restrictive state after import ENT-2684
-  (chown cfpostgres "$PREFIX/share/db/*.sql")
+  chown cfpostgres $PREFIX/share/db/*.sql
   (cd /tmp && chown cfpostgres "$PREFIX/share/db/schema.sql" && su cfpostgres -c "$PREFIX/bin/psql cfdb -f $PREFIX/share/db/schema.sql" && chown root "$PREFIX/share/db/schema.sql")
 
   #create database for MISSION PORTAL
@@ -708,9 +712,12 @@ else
 
 
   #create database for hub internal data
-  (cd /tmp && chown cfpostgres "$PREFIX/share/db/schema_settings.sql" && su cfpostgres -c "$PREFIX/bin/psql cfsettings -f $PREFIX/share/db/schema_settings.sql" && chown root "$PREFIX/share/db/schema_settings.sql")
-  (cd /tmp && chown cfpostgres "$PREFIX/share/db/ootb_settings.sql" && su cfpostgres -c "$PREFIX/bin/psql cfsettings -f $PREFIX/share/db/ootb_settings.sql" && chown root "$PREFIX/share/db/ootb_settings.sql")
-  (cd /tmp && chown cfpostgres "$PREFIX/share/db/ootb_import.sql" && su cfpostgres -c "$PREFIX/bin/psql cfdb -f $PREFIX/share/db/ootb_import.sql" && chown root "$PREFIX/share/db/ootb_import.sql")
+  (
+    cd /tmp
+    chown cfpostgres "$PREFIX/share/db/schema_settings.sql" && su cfpostgres -c "$PREFIX/bin/psql cfsettings -f $PREFIX/share/db/schema_settings.sql" && chown root "$PREFIX/share/db/schema_settings.sql"
+    chown cfpostgres "$PREFIX/share/db/ootb_settings.sql" && su cfpostgres -c "$PREFIX/bin/psql cfsettings -f $PREFIX/share/db/ootb_settings.sql" && chown root "$PREFIX/share/db/ootb_settings.sql"
+    chown cfpostgres "$PREFIX/share/db/ootb_import.sql" && su cfpostgres -c "$PREFIX/bin/psql cfdb -f $PREFIX/share/db/ootb_import.sql" && chown root "$PREFIX/share/db/ootb_import.sql"
+  )
 
   #revoke create permission on public schema for cfdb database
   (cd /tmp && su cfpostgres -c "$PREFIX/bin/psql cfdb") << EOF
@@ -763,9 +770,11 @@ find $PREFIX/httpd/htdocs/scripts/ -type f -exec chmod 0440 {} +
 find $PREFIX/httpd/htdocs/tmp/ -type f -exec chown -R root:$MP_APACHE_USER {} +
 find $PREFIX/httpd/htdocs/tmp/ -type f -exec chmod 0660 {} +
 
-# logs
-find $PREFIX/httpd/htdocs/logs/ -type f -exec chown -R $MP_APACHE_USER:$MP_APACHE_USER {} +
-find $PREFIX/httpd/htdocs/logs/ -type f -exec chmod 0640 {} +
+# logs (if any)
+if [ -d $PREFIX/httpd/htdocs/logs/ ]; then
+  find $PREFIX/httpd/htdocs/logs/ -type f -exec chown -R $MP_APACHE_USER:$MP_APACHE_USER {} +
+  find $PREFIX/httpd/htdocs/logs/ -type f -exec chmod 0640 {} +
+fi
 
 # application
 find $PREFIX/httpd/htdocs/application/ -type f -exec chown -R root:$MP_APACHE_USER {} +

packaging/common/cfengine-hub/preinstall.sh

@@ -114,7 +114,8 @@ fi
 #stop the remaining services on upgrade
 if is_upgrade; then
   cf_console platform_service cfengine3 stop
-  if [ -x /bin/systemctl ]; then
+  # CFE-2278: Migrate to split units
+  if [ -x /bin/systemctl ] && [ -e /usr/lib/systemd/system/cfengine3-web.service ]; then
     # When using systemd, the services are split in two, and although both will
     # stop due to the command above, the web part may only do so after some
     # delay, which may cause problems in an upgrade situation, since this script
@@ -123,14 +124,6 @@ if is_upgrade; then
   fi
 fi
 
-# CFE-2278: Migrate to split units
-if is_upgrade; then
-  if [ -e /usr/lib/systemd/system/cfengine3-web.service ]; then
-    # It's functionality is replaced with multiple units.
-    /bin/systemctl disable cfengine3-web.service
-  fi
-fi
-
 if migrating_postgres; then
   cf_console echo "Moving old data and copying old binaries to $BACKUP_DIR"
   # Now that PostgreSQL is shut down, move the old data out of the way.
@@ -164,18 +157,25 @@ if migrating_postgres; then
     cp -a "$BACKUP_DIR/data/postgresql.conf" "$BACKUP_DIR/data/postgresql.conf.modified"
   fi
   cp -al "$PREFIX/bin" "$BACKUP_DIR"
-  cp -l "$PREFIX/lib"/* "$BACKUP_DIR/lib"
+  for file in "$PREFIX/lib"/*; do
+    if [ -f $file ]; then
+      cp -l $file "$BACKUP_DIR/lib"
+    fi
+  done
   cp -al "$PREFIX/lib/postgresql/" "$BACKUP_DIR/lib"
   cp -al "$PREFIX/share/postgresql/" "$BACKUP_DIR/share"
 fi
 
 filter_netstat_listen()
 {
+  set +e
   if [ -x /usr/sbin/ss ]; then
     ss -natp | egrep "LISTEN.*($1)"
   else
     netstat -natp | egrep "($1).*LISTEN"
   fi
+  set -e
+  return 0
 }
 
 #
@@ -326,7 +326,7 @@ if [ -d $PREFIX/httpd/htdocs ]; then
     cf_console echo "Using share/GUI as template"
     ( cd $PREFIX/share/GUI
       # Make list of files in share/GUI and remove "them" from httpd/htdocs
-      find -type f -print0 | ( cd ../../httpd/htdocs/ && xargs -0 rm )
+      find -type f -print0 | ( cd ../../httpd/htdocs/ && xargs -0 rm -f )
     )
   else
     # Purge all files in httpd/htdocs with hardcoded exceptions:

packaging/common/cfengine-hub/preremove.sh

@@ -1,5 +1,5 @@
 cf_console platform_service cfengine3 stop
-if [ -x /bin/systemctl ]; then
+if [ -x /bin/systemctl ] && [ -e /usr/lib/systemd/system/cfengine3-web.service ]; then
   # When using systemd, the services are split in two, and although both will
   # stop due to the command above, the web part may only do so after some
   # delay, which may cause problems later if the binaries are gone by the time
@@ -12,7 +12,7 @@ case "`os_type`" in
     chkconfig --del cfengine3
     ;;
   debian)
-    update-rc.d cfengine3 remove
+    update-rc.d -f cfengine3 remove
     ;;
 esac
 
@@ -39,11 +39,8 @@ case "`package_type`" in
     ;;
 esac
 
-if [ -f "$MAN_CONFIG" ]; then
-  grep -q cfengine "$MAN_CONFIG"
-  if [ $? = "0" ]; then
-    sed -i '/cfengine/d' "$MAN_CONFIG"
-  fi
+if [ -f "$MAN_CONFIG" ] && grep -q cfengine "$MAN_CONFIG"; then
+  sed -i '/cfengine/d' "$MAN_CONFIG"
 fi
 
 #

packaging/common/cfengine-non-hub/postremove.sh

@@ -3,7 +3,7 @@ case `os_type` in
     #
     # Unregister CFEngine initscript.
     #
-    /usr/sbin/update-rc.d cfengine3 remove
+    /usr/sbin/update-rc.d -f cfengine3 remove
     ;;
 esac
 

packaging/common/cfengine-non-hub/preinstall.sh

@@ -35,7 +35,7 @@ esac
 case `os_type` in
   debian)
     if [ -x /etc/init.d/cfengine3 ]; then
-      /usr/sbin/update-rc.d cfengine3 remove
+      /usr/sbin/update-rc.d -f cfengine3 remove
     fi
     ;;
 esac

packaging/common/produce-script

@@ -35,6 +35,12 @@ include_script()
 
 include_script "$TEMPLATEDIR/$PKG_TYPE-script-common.sh"
 
+case "$PKG_TYPE" in
+    deb|rpm)
+      echo "set -e"
+      ;;
+esac
+
 echo "PKG_TYPE=$PKG_TYPE"
 echo "SCRIPT_TYPE=$SCRIPT_TYPE"
 echo "PROJECT_TYPE=$PROJECT_TYPE"

packaging/common/script-templates/script-common.sh

@@ -53,7 +53,14 @@ restore_cfengine_state() {
     # $1 -- file where the state to restore is saved (see get_cfengine_state())
 
     if type systemctl >/dev/null 2>&1; then
-        xargs -n1 -a "$1" systemctl start
+        for service in `cat "$1"`; do
+            definition=`systemctl cat "$service"` || continue
+            # only try to start service that are defined/exist (some may be gone
+            # in the new version)
+            if [ -n "$definition" ]; then
+                systemctl start "$service"
+            fi
+        done
     else
         CALLED_FROM_STATE_RESTORE=1
         if [ -f ${PREFIX}/bin/cfengine3-nova-hub-init-d.sh ]; then
@@ -67,7 +74,9 @@ restore_cfengine_state() {
         fi
 
         for d in `grep 'cf-' "$1"`; do
-            ${PREFIX}/bin/${d}
+            if [ -f ${PREFIX}/bin/${d} ]; then
+                ${PREFIX}/bin/${d}
+            fi
         done
     fi
 }