Fixed install/remove of influxdb on non-systemd Debian/Ubuntu systems

CHANGELOG.md

@@ -48,6 +48,7 @@ The admin UI is removed and unusable in this release. The `[admin]` configuratio
 - [#8058](https://github.com/influxdata/influxdb/pull/8058): Enabled golint for admin, httpd, subscriber, udp. @karlding
 - [#8252](https://github.com/influxdata/influxdb/issues/8252): Implicitly cast null to false in binary expressions with a boolean.
 - [#8067](https://github.com/influxdata/influxdb/issues/8067): Restrict fill(none) and fill(linear) to be usable only with aggregate queries.
+- [#7933](https://github.com/influxdata/influxdb/pull/7933): Fixed install/remove of influxdb on non-systemd Debian/Ubuntu systems
 
 ## v1.2.3 [unreleased]
 

package.sh

@@ -67,7 +67,7 @@ if [ -z "$FPM" ]; then
     FPM=`which fpm`
 fi
 
-GO_VERSION="go1.4.3"
+GO_VERSION="go1.8.1"
 GOPATH_INSTALL=
 BINS=(
     influxd

scripts/post-install.sh

@@ -24,8 +24,7 @@ function install_chkconfig {
     chkconfig --add influxdb
 }
 
-id influxdb &>/dev/null
-if [[ $? -ne 0 ]]; then
+if ! id influxdb &>/dev/null; then
     useradd --system -U -M influxdb -s /bin/false -d $DATA_DIR
 fi
 
@@ -45,29 +44,42 @@ fi
 # Distribution-specific logic
 if [[ -f /etc/redhat-release ]]; then
     # RHEL-variant logic
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-	install_systemd
+    if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+        install_systemd
     else
-	# Assuming sysv
-	install_init
-	install_chkconfig
+        # Assuming SysVinit
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
     fi
 elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
-    which systemctl &>/dev/null
-    if [[ $? -eq 0 ]]; then
-	install_systemd
+    if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+        install_systemd
     else
-	# Assuming sysv
-	install_init
-	install_update_rcd
+        # Assuming SysVinit
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
     fi
 elif [[ -f /etc/os-release ]]; then
     source /etc/os-release
     if [[ $ID = "amzn" ]]; then
-	# Amazon Linux logic
-	install_init
-	install_chkconfig
+        # Amazon Linux logic
+        install_init
+        # Run update-rc.d or fallback to chkconfig if not available
+        if which update-rc.d &>/dev/null; then
+            install_update_rcd
+        else
+            install_chkconfig
+        fi
     fi
 fi

scripts/post-uninstall.sh

@@ -18,39 +18,37 @@ function disable_chkconfig {
 if [[ -f /etc/redhat-release ]]; then
     # RHEL-variant logic
     if [[ "$1" = "0" ]]; then
-	# InfluxDB is no longer installed, remove from init system
-	rm -f /etc/default/influxdb
-
-	which systemctl &>/dev/null
-	if [[ $? -eq 0 ]]; then
-	    disable_systemd
-	else
-	    # Assuming sysv
-	    disable_chkconfig
-	fi
+        # InfluxDB is no longer installed, remove from init system
+        rm -f /etc/default/influxdb
+
+        if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+            disable_systemd
+        else
+            # Assuming sysv
+            disable_chkconfig
+        fi
     fi
-elif [[ -f /etc/lsb-release ]]; then
+elif [[ -f /etc/debian_version ]]; then
     # Debian/Ubuntu logic
     if [[ "$1" != "upgrade" ]]; then
-	# Remove/purge
-	rm -f /etc/default/influxdb
-
-	which systemctl &>/dev/null
-	if [[ $? -eq 0 ]]; then
-	    disable_systemd
-	else
-	    # Assuming sysv
-	    disable_update_rcd
-	fi
+        # Remove/purge
+        rm -f /etc/default/influxdb
+
+        if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then
+            disable_systemd
+        else
+            # Assuming sysv
+            disable_update_rcd
+        fi
     fi
 elif [[ -f /etc/os-release ]]; then
     source /etc/os-release
     if [[ $ID = "amzn" ]]; then
-	# Amazon Linux logic
-	if [[ "$1" = "0" ]]; then
-	    # InfluxDB is no longer installed, remove from init system
-	    rm -f /etc/default/influxdb
-	    disable_chkconfig
-	fi
+        # Amazon Linux logic
+        if [[ "$1" = "0" ]]; then
+            # InfluxDB is no longer installed, remove from init system
+            rm -f /etc/default/influxdb
+            disable_chkconfig
+        fi
     fi
 fi

scripts/pre-install.sh

@@ -3,14 +3,14 @@
 if [[ -d /etc/opt/influxdb ]]; then
     # Legacy configuration found
     if [[ ! -d /etc/influxdb ]]; then
-	# New configuration does not exist, move legacy configuration to new location
-	echo -e "Please note, InfluxDB's configuration is now located at '/etc/influxdb' (previously '/etc/opt/influxdb')."
-	mv -vn /etc/opt/influxdb /etc/influxdb
+        # New configuration does not exist, move legacy configuration to new location
+        echo -e "Please note, InfluxDB's configuration is now located at '/etc/influxdb' (previously '/etc/opt/influxdb')."
+        mv -vn /etc/opt/influxdb /etc/influxdb
 
-	if [[ -f /etc/influxdb/influxdb.conf ]]; then
-	    backup_name="influxdb.conf.$(date +%s).backup"
-	    echo "A backup of your current configuration can be found at: /etc/influxdb/$backup_name"
-	    cp -a /etc/influxdb/influxdb.conf /etc/influxdb/$backup_name
-	fi
+        if [[ -f /etc/influxdb/influxdb.conf ]]; then
+            backup_name="influxdb.conf.$(date +%s).backup"
+            echo "A backup of your current configuration can be found at: /etc/influxdb/${backup_name}"
+            cp -a "/etc/influxdb/influxdb.conf" "/etc/influxdb/${backup_name}"
+        fi
     fi
 fi