Merge pull request #18 from phendryx/blocklist-cleanup

Blocklist script cleanup
full path to settings.json
2025-12-24 08:59:43 +01:00 · 2016-11-10 05:01:51 +00:00 · 2016-11-03 07:12:13 -04:00 · 2016-11-02 10:04:54 -04:00 · 2016-11-02 09:39:55 -04:00 · 2016-11-02 09:38:19 -04:00
1 changed files with 17 additions and 7 deletions
--- a/root/defaults/blocklist-update.sh
+++ b/root/defaults/blocklist-update.sh
@@ -1,10 +1,20 @@
 #!/usr/bin/with-contenv bash

-BLOCKLIST_URL=`jq -r '.["blocklist-url"]' settings.json`
+BLOCKLIST_ENABLED=`jq -r '.["blocklist-enabled"]' /config/settings.json`
+BLOCKLIST_URL=`jq -r '.["blocklist-url"]' /config/settings.json | sed 's/\&amp;/\&/g'`

-rm /config/blocklists/*
-cd /config/blocklists
-wget -q $BLOCKLIST_URL
-gunzip *.gz
-chmod go+r *
-s6-svc -h /var/run/s6/services/transmission
+if [ $BLOCKLIST_ENABLED == true ]; then
+	mkdir -p /tmp/blocklists
+	rm -rf /tmp/blocklists/*
+	cd /tmp/blocklists
+	wget -q -O blocklist.gz "$BLOCKLIST_URL"
+	if [ $? == 0 ]; then
+		gunzip *.gz
+		if [ $? == 0 ]; then
+			chmod go+r *
+			rm -rf /config/blocklists/*
+			cp /tmp/blocklists/* /config/blocklists
+			s6-svc -h /var/run/s6/services/transmission
+		fi
+	fi
+fi
Author	SHA1	Message	Date
sparklyballs	5138709d55	Merge pull request #18 from phendryx/blocklist-cleanup Blocklist script cleanup	2016-11-10 05:01:51 +00:00
Paul Hendryx	f7490f4fd7	full path to settings.json	2016-11-03 07:12:13 -04:00
Paul Hendryx	6bad2d716e	replace & with &, static filename output for wget	2016-11-02 10:04:54 -04:00
Paul Hendryx	72c8df500e	working script from container	2016-11-02 09:39:55 -04:00
Paul Hendryx	a1b5353ea2	fixed update script	2016-11-02 09:38:19 -04:00