Minor changes in Debian scripts

debian/clickhouse-server.init

@@ -18,7 +18,6 @@ EXTRACT_FROM_CONFIG=${CLICKHOUSE_GENERIC_PROGRAM}-extract-from-config
 CLICKHOUSE_CONFDIR=/etc/$PROGRAM
 CLICKHOUSE_LOGDIR=/var/log/clickhouse-server
 CLICKHOUSE_LOGDIR_USER=root
-CLICKHOUSE_DATADIR_OLD=/opt/clickhouse
 CLICKHOUSE_DATADIR=/var/lib/clickhouse
 if [ -d "/var/lock" ]; then
     LOCALSTATEDIR=/var/lock
@@ -34,7 +33,6 @@ CLICKHOUSE_BINDIR=/usr/bin
 CLICKHOUSE_CRONFILE=/etc/cron.d/clickhouse-server
 CLICKHOUSE_CONFIG=$CLICKHOUSE_CONFDIR/config.xml
 LOCKFILE=$LOCALSTATEDIR/$PROGRAM
-RETVAL=0
 CLICKHOUSE_PIDDIR=/var/run/$PROGRAM
 CLICKHOUSE_PIDFILE="$CLICKHOUSE_PIDDIR/$PROGRAM.pid"
 # CLICKHOUSE_STOP_TIMEOUT=60 # Disabled by default. Place to /etc/default/clickhouse if you need.
@@ -182,7 +180,7 @@ start()
             su -s $SHELL ${CLICKHOUSE_USER} -c "$FLOCK -u 9; $CLICKHOUSE_PROGRAM_ENV exec -a \"$PROGRAM\" \"$CLICKHOUSE_BINDIR/$PROGRAM\" --daemon --pid-file=\"$CLICKHOUSE_PIDFILE\" --config-file=\"$CLICKHOUSE_CONFIG\""
             EXIT_STATUS=$?
             if [ $EXIT_STATUS -ne 0 ]; then
-                break
+                return $EXIT_STATUS
             fi
         fi
     fi

debian/clickhouse-server.postinst

@@ -62,13 +62,13 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
     fi
 
     # check validity of user and group
-    if [ "`id -u ${CLICKHOUSE_USER}`" -eq 0 ]; then
+    if [ "$(id -u ${CLICKHOUSE_USER})" -eq 0 ]; then
         echo "The ${CLICKHOUSE_USER} system user must not have uid 0 (root).
 Please fix this and reinstall this package." >&2
         exit 1
     fi
 
-    if [ "`id -g ${CLICKHOUSE_GROUP}`" -eq 0 ]; then
+    if [ "$(id -g ${CLICKHOUSE_GROUP})" -eq 0 ]; then
         echo "The ${CLICKHOUSE_USER} system user must not have root as primary group.
 Please fix this and reinstall this package." >&2
         exit 1