Working preinst script

diff --git a/debian/argeo-freed-cms.preinst b/debian/argeo-freed-cms.preinst
index be3d41d16900942400fe046935203035e53a2b71..fd1ae554e6a840d2efa999a47690cc2518957a45 100755 (executable)
--- a/debian/argeo-freed-cms.preinst
+++ b/debian/argeo-freed-cms.preinst
@@ -17,15 +17,14 @@ case "$1" in
   [ -z "$SERVER_NAME" ] && SERVER_NAME="FREEd Apps"
   [ -z "$SERVER_GROUP" ] && SERVER_GROUP=freed
 
-  # Groups that the user will be added to, if undefined, then none.
-  ADDGROUP=""
-
   # create user to avoid running server as root
   # 1. create group if not existing
   if ! getent group $SERVER_GROUP | grep -q "^$SERVER_GROUP:" ; then
      echo -n "Adding group $SERVER_GROUP.."
      addgroup --quiet --system $SERVER_GROUP 2>/dev/null ||true
      echo "..done"
+  else
+    echo "System group '$SERVER_GROUP' already exists"
   fi
   # 2. create homedir if not existing
   test -d $SERVER_HOME || mkdir $SERVER_HOME
@@ -39,26 +38,20 @@ case "$1" in
             --disabled-password \
             $SERVER_USER 2>/dev/null || true
     echo "..done"
-  fi
   # 4. adjust passwd entry
-  usermod -c "$SERVER_NAME" \
-          -d $SERVER_HOME   \
-          -g $SERVER_GROUP  \
-             $SERVER_USER
+    usermod -c "$SERVER_NAME" \
+            -d $SERVER_HOME   \
+            -g $SERVER_GROUP  \
+               $SERVER_USER
+  else
+    echo "System user '$SERVER_USER' already exists"
+  fi
   # 5. adjust file and directory permissions
   if ! dpkg-statoverride --list $SERVER_HOME >/dev/null
   then
       chown -R $SERVER_USER:adm $SERVER_HOME
       chmod u=rwx,g=rxs,o= $SERVER_HOME
   fi
-  # 6. Add the user to the ADDGROUP group
-  if test -n $ADDGROUP
-  then
-      if ! groups $SERVER_USER | cut -d: -f2 | \
-         grep -qw $ADDGROUP; then
-           adduser $SERVER_USER $ADDGROUP
-      fi
-  fi
   ;;
   *)
 esac