From fc675e426240391d06875b7dde5523fb1dca59e4 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 10 Feb 2018 21:32:36 +0100
Subject: [PATCH] - move services-script from skel-root/ to
 archive-imagefiles/scripts

---
 .../scripts}/service                          |  0
 make/ni.mk                                    |  1 +
 make/plugins.mk                               |  9 +++++
 skel-root/coolstream/hd1/sbin/service         | 34 -------------------
 skel-root/coolstream/hd2/sbin/service         | 34 -------------------
 5 files changed, 10 insertions(+), 68 deletions(-)
 rename {skel-root/armbox/hd51/sbin => archive-imagefiles/scripts}/service (100%)
 delete mode 100755 skel-root/coolstream/hd1/sbin/service
 delete mode 100755 skel-root/coolstream/hd2/sbin/service

diff --git a/skel-root/armbox/hd51/sbin/service b/archive-imagefiles/scripts/service
similarity index 100%
rename from skel-root/armbox/hd51/sbin/service
rename to archive-imagefiles/scripts/service
diff --git a/make/ni.mk b/make/ni.mk
index 0966aad3..b039abdc 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -106,6 +106,7 @@ endif
 ifeq ($(PERSONALIZE), yes)
 	make personalize
 endif
+	make scripts
 	make init-scripts
 	make rootfs
 	make images
diff --git a/make/plugins.mk b/make/plugins.mk
index 805ed322..8cd5ba14 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -12,6 +12,7 @@ $(T):
 BIN		= $(TARGET_DIR)/bin
 ETCINIT		= $(TARGET_DIR)/etc/init.d
 LIBPLUG		= $(TARGET_DIR)/lib/tuxbox/plugins
+SBIN		= $(TARGET_DIR)/sbin
 SHAREICONS	= $(TARGET_DIR)/share/tuxbox/neutrino/icons
 SHAREFLEX	= $(TARGET_DIR)/share/tuxbox/neutrino/flex
 SHAREPLUG	= $(TARGET_DIR)/share/tuxbox/neutrino/plugins
@@ -25,6 +26,7 @@ VARCONF		= $(TARGET_DIR)/var/tuxbox/config
 $(BIN) \
 $(ETCINIT) \
 $(LIBPLUG) \
+$(SBIN) \
 $(SHAREICONS) \
 $(SHAREFLEX) \
 $(SHAREPLUG) \
@@ -82,6 +84,13 @@ plugins-hd2: # nothing to do
 plugins-hd51: \
 	showiframe
 
+################
+### scripts  ###
+################
+
+scripts:
+	install -m755 $(IMAGEFILES)/scripts/service $(SBIN)
+
 #####################
 ### init-scripts  ###
 #####################
diff --git a/skel-root/coolstream/hd1/sbin/service b/skel-root/coolstream/hd1/sbin/service
deleted file mode 100755
index 6479274f..00000000
--- a/skel-root/coolstream/hd1/sbin/service
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-SERVICE="$1"
-ACTION="$2"
-shift 2
-OPTIONS="$*"
-
-usage() {
-	echo "usage: service <name> <action>"
-	echo "       start or stop a given service (init script)"
-	echo "       action depends on the init script"
-	echo
-	exit 1
-}
-
-test -z "$ACTION" && usage;
-
-for i in /etc/init.d/$SERVICE /var/etc/init.d/$SERVICE; do
-	if [ -x "$i" ]; then
-		LOGINFO "running $i $ACTION $OPTIONS"
-		"$i" "$ACTION" "$OPTIONS"
-		exit $?
-	fi
-done
-
-echo "$SERVICE not found in /etc/init.d/ and /var/etc/init.d/"
-SERVICES=$(for i in /etc/init.d/[^SK]* /var/etc/init.d/[^SK]*; do
-		echo "${i##*/}";
-	done | sort -u | grep -v '^\(functions\|globals\|rcK\|rcS\|start\|start_neutrino\|\[\^SK\]\*\)$')
-echo "available services:"
-echo $SERVICES | xargs -n 1 echo "	"
-exit 1
diff --git a/skel-root/coolstream/hd2/sbin/service b/skel-root/coolstream/hd2/sbin/service
deleted file mode 100755
index 6479274f..00000000
--- a/skel-root/coolstream/hd2/sbin/service
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-SERVICE="$1"
-ACTION="$2"
-shift 2
-OPTIONS="$*"
-
-usage() {
-	echo "usage: service <name> <action>"
-	echo "       start or stop a given service (init script)"
-	echo "       action depends on the init script"
-	echo
-	exit 1
-}
-
-test -z "$ACTION" && usage;
-
-for i in /etc/init.d/$SERVICE /var/etc/init.d/$SERVICE; do
-	if [ -x "$i" ]; then
-		LOGINFO "running $i $ACTION $OPTIONS"
-		"$i" "$ACTION" "$OPTIONS"
-		exit $?
-	fi
-done
-
-echo "$SERVICE not found in /etc/init.d/ and /var/etc/init.d/"
-SERVICES=$(for i in /etc/init.d/[^SK]* /var/etc/init.d/[^SK]*; do
-		echo "${i##*/}";
-	done | sort -u | grep -v '^\(functions\|globals\|rcK\|rcS\|start\|start_neutrino\|\[\^SK\]\*\)$')
-echo "available services:"
-echo $SERVICES | xargs -n 1 echo "	"
-exit 1