From 2f9fbd20f0278ea6f43e9d8b25f789ee263b4ea8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 3 Nov 2018 01:01:21 +0100 Subject: [PATCH] - remove autoreboot plugin; new location is ni-neutrino-plugins repo --- archive-sources/autoreboot/autoreboot.cfg | 5 ---- archive-sources/autoreboot/autoreboot.sh | 33 ----------------------- make/plugins.mk | 4 +-- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 archive-sources/autoreboot/autoreboot.cfg delete mode 100755 archive-sources/autoreboot/autoreboot.sh diff --git a/archive-sources/autoreboot/autoreboot.cfg b/archive-sources/autoreboot/autoreboot.cfg deleted file mode 100644 index 5d97fc71..00000000 --- a/archive-sources/autoreboot/autoreboot.cfg +++ /dev/null @@ -1,5 +0,0 @@ -name=Autoreboot -desc=Small plugin to reboot box (via timer) -desc.deutsch=Kleines Plugin, um die Box (via Timer) neu zu starten -type=3 -shellwindow=0 diff --git a/archive-sources/autoreboot/autoreboot.sh b/archive-sources/autoreboot/autoreboot.sh deleted file mode 100755 index 043fdcf7..00000000 --- a/archive-sources/autoreboot/autoreboot.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -CONFIGDIR="/var/tuxbox/config" -nhttpd=${CONFIGDIR}"/nhttpd.conf" - -htauth=$(grep "^mod_auth.authenticate" $nhttpd | cut -d"=" -f2) -htuser=$(grep "^mod_auth.username" $nhttpd | cut -d"=" -f2) -htpass=$(grep "^mod_auth.password" $nhttpd | cut -d"=" -f2) -htport=$(grep "^WebsiteMain.port" $nhttpd | cut -d"=" -f2) -if [ "$htauth" = "true" ] -then - hturl="http://$htuser:$htpass@127.0.0.1:$htport" -else - hturl="http://127.0.0.1:$htport" -fi - -if [ $(wget -q -O - "$hturl/control/setmode?status" | sed 's/\r$//') = "on" ] -then - echo "[${0##*/}] record in progress; delay reboot" - new_alarm=$(($(date +%s)+300)) - wget -q -O - "$hturl//control/timer?action=new&type=8&alarm=${new_alarm}&PluginName=autoreboot" - exit -fi - -if [ $(wget -q -O - "$hturl/control/standby" | sed 's/\r$//') = "off" ] -then - wget -q -O - "$hturl/control/standby?on" - echo "" - sleep 20 -fi - -echo "[${0##*/}] will reboot now" -(sleep 1; reboot) & diff --git a/make/plugins.mk b/make/plugins.mk index 744e5328..ce759c0f 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -195,8 +195,8 @@ pr-auto-timer: $(LIBPLUGINS) $(VARCONFIG) install -m644 $(SOURCES)/pr-auto-timer/pr-auto-timer.rules.template $(VARCONFIG)/pr-auto-timer.rules autoreboot: $(LIBPLUGINS) - install -m755 $(SOURCES)/$@/*.sh $(LIBPLUGINS)/ - install -m644 $(SOURCES)/$@/*.cfg $(LIBPLUGINS)/ + install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.sh $(LIBPLUGINS)/ + install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/ logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(LIBPLUGINS) install -m755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(LIBPLUGINS)/