introduce INITDIR and use it

bin/serv

@@ -32,6 +32,8 @@ load_helper()
 
 load_helper epm-sh-functions
 
+INITDIR=/etc/init.d
+
 PATH=$PATH:/sbin:/usr/sbin
 
 set_sudo

bin/serv-common

@@ -27,12 +27,12 @@ serv_common()
 			sudocmd service $SERVICE "$@"
 			;;
 		service-initd|service-update)
-			sudocmd /etc/init.d/$SERVICE "$@"
+			sudocmd $INITDIR/$SERVICE "$@"
 			;;
 		systemd)
 			# run init script directly (for nonstandart commands)
-			if [ -x /etc/init.d/$SERVICE ] ; then
-				sudocmd /etc/init.d/$SERVICE "$@"
+			if [ -x $INITDIR/$SERVICE ] ; then
+				sudocmd $INITDIR/$SERVICE "$@"
 			else
 				sudocmd systemctl "$@" $SERVICE
 			fi
@@ -41,5 +41,4 @@ serv_common()
 			fatal "Have no suitable command for $SERVICETYPE"
 			;;
 	esac
-
 }

bin/serv-list_all

@@ -26,7 +26,7 @@ serv_list_all()
 			sudocmd chkconfig --list | cut -f1
 			;;
 		service-initd|service-update)
-			sudocmd ls -1 /etc/init.d/* | sed -e "s|/etc/init.d/||g" | grep -v README
+			sudocmd ls $INITDIR/ | grep -v README
 			;;
 		systemd)
 			sudocmd systemctl list-unit-files $@

bin/serv-start

@@ -28,7 +28,7 @@ serv_start()
 			sudocmd service $SERVICE start "$@"
 			;;
 		service-initd|service-update)
-			sudocmd /etc/init.d/$SERVICE start "$@"
+			sudocmd $INITDIR/$SERVICE start "$@"
 			;;
 		systemd)
 			sudocmd systemctl start "$SERVICE" "$@"

bin/serv-status

@@ -25,7 +25,7 @@ is_service_running()
 			$SUDO service $1 status >/dev/null
 			;;
 		service-initd|service-update)
-			$SUDO /etc/init.d/$1 status >/dev/null
+			$SUDO $INITDIR/$1 status >/dev/null
 			;;
 		systemd)
 			$SUDO systemctl status $1 >/dev/null
@@ -67,7 +67,7 @@ serv_status()
 			sudocmd service $SERVICE status "$@"
 			;;
 		service-update)
-			sudocmd /etc/init.d/$SERVICE status "$@"
+			sudocmd $INITDIR/$SERVICE status "$@"
 			;;
 		systemd)
 			sudocmd systemctl status $SERVICE "$@"

bin/serv-stop

@@ -28,7 +28,7 @@ serv_stop()
 			sudocmd service $SERVICE stop "$@"
 			;;
 		service-initd|service-update)
-			sudocmd /etc/init.d/$SERVICE stop "$@"
+			sudocmd $INITDIR/$SERVICE stop "$@"
 			;;
 		systemd)
 			sudocmd systemctl stop $SERVICE "$@"

bin/serv-try_restart

@@ -32,7 +32,7 @@ serv_try_restart()
 			;;
 		service-initd|service-update)
 			is_service_running $SERVICE || return 0
-			sudocmd /etc/init.d/$SERVICE restart "$@"
+			sudocmd $INITDIR/$SERVICE restart "$@"
 			;;
 		systemd)
 			sudocmd systemctl try-restart $SERVICE "$@"