Update to v3.0.0. Changed to use wg3-cron file

2026-02-19 19:52:00 +08:00 · 2020-03-29 19:30:01 +02:00 · 2020-03-29 19:30:01 +02:00 · 04909fd68c
commit 04909fd68c
parent 30a3f58420
9 changed files with 46 additions and 28 deletions
--- a/20
+++ b/20
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"

 # package versions
-ARG WEBGRAB_VER="2.1.0"
-ARG WGUPDATE_VER="2.1.9_beta"
+ARG WEBGRAB_VER="3.0.0"
+ARG WGUPDATE_VER=""

 # environment variables.
 ARG DEBIAN_FRONTEND="noninteractive"
@ -38,13 +38,15 @@ RUN \
 tar xzf \
 /tmp/wg++.tar.gz -C \
 	/app/wg++ --strip-components=1 && \
- WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
- curl -o \
- /tmp/update.tar.gz -L \
-	"http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
- tar xf \
- /tmp/update.tar.gz -C \
-	/app/wg++/bin/ --strip-components=2 && \
+ if [ ! -z "$WGUPDATE_ver" ]; then \
+ 	WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
+ 	curl -o \
+ 	/tmp/update.tar.gz -L \
+		"http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
+ 	tar xf \
+ 	/tmp/update.tar.gz -C \
+		/app/wg++/bin/ --strip-components=2; \
+ fi && \
 echo "**** download siteini.pack ****" && \
 curl -o \
 /tmp/ini.zip -L \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"

 # package versions
-ARG WEBGRAB_VER="2.1.0"
-ARG WGUPDATE_VER="2.1.9_beta"
+ARG WEBGRAB_VER="3.0.0"
+ARG WGUPDATE_VER=""

 # environment variables.
 ARG DEBIAN_FRONTEND="noninteractive"
@ -38,13 +38,15 @@ RUN \
 tar xzf \
 /tmp/wg++.tar.gz -C \
 	/app/wg++ --strip-components=1 && \
+ if [ ! -z "$WGUPDATE_ver" ]; then \
 WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
 curl -o \
 /tmp/update.tar.gz -L \
 	"http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
 tar xf \
 /tmp/update.tar.gz -C \
-	/app/wg++/bin/ --strip-components=2 && \
+	/app/wg++/bin/ --strip-components=2; \
+ fi && \
 echo "**** download siteini.pack ****" && \
 curl -o \
 /tmp/ini.zip -L \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"

 # package versions
-ARG WEBGRAB_VER="2.1.0"
-ARG WGUPDATE_VER="2.1.9_beta"
+ARG WEBGRAB_VER="3.0.0"
+ARG WGUPDATE_VER=""

 # environment variables.
 ARG DEBIAN_FRONTEND="noninteractive"
@ -38,13 +38,15 @@ RUN \
 tar xzf \
 /tmp/wg++.tar.gz -C \
 	/app/wg++ --strip-components=1 && \
+ if [ ! -z "$WGUPDATE_ver" ]; then \
 WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
 curl -o \
 /tmp/update.tar.gz -L \
 	"http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
 tar xf \
 /tmp/update.tar.gz -C \
-	/app/wg++/bin/ --strip-components=2 && \
+	/app/wg++/bin/ --strip-components=2; \
+ fi && \
 echo "**** download siteini.pack ****" && \
 curl -o \
 /tmp/ini.zip -L \
--- a/README.md
+++ b/README.md
@ -145,9 +145,11 @@ Note that there are some things in the guide that does not apply to this contain

 The /data volume mapping is where WebGrab+Plus outputs the xml file. To use the xml file in another program, you have to point it to the host path you mapped the /data volume to.

-To adjust the scheduled cron job for grabbing, edit the wg-cron file found in the `/config` folder. After you have edited the the wg-cron file, restart the container to apply the new schedule.
+To adjust the scheduled cron job for grabbing, edit the wg3-cron file found in the `/config` folder. After you have edited the the wg3-cron file, restart the container to apply the new schedule.
 Do not adjust the command!

+**Note that due to something in version 3, we had to change the commands for scheduling the grab. If you have a version where there is a wg-cron file in your /config mount, delete it and use wg3-cron instead.**
+
 Below is the syntax of the cron file.

 ```
@ -159,7 +161,7 @@ Below is the syntax of the cron file.
 │ │ │ │ │                                       7 is also Sunday on some systems)
 │ │ │ │ │
 │ │ │ │ │
- * * * * *  s6-setuidgid abc /bin/bash /defaults/update.sh
+ * * * * *  /bin/bash /defaults/update.sh
 ```


@ -228,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **29.03.20:** - Update to v3.0.0. Changed to use wg3-cron file.
 * **28.05.19:** - Update to v2.1.0 and beta v2.1.9, rebase to bionic.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **21.03.19:** - Update to beta 2.1.7.
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -41,9 +41,11 @@ app_setup_block: |

  The /data volume mapping is where WebGrab+Plus outputs the xml file. To use the xml file in another program, you have to point it to the host path you mapped the /data volume to.

-  To adjust the scheduled cron job for grabbing, edit the wg-cron file found in the `/config` folder. After you have edited the the wg-cron file, restart the container to apply the new schedule.
+  To adjust the scheduled cron job for grabbing, edit the wg3-cron file found in the `/config` folder. After you have edited the the wg3-cron file, restart the container to apply the new schedule.
  Do not adjust the command!

+  **Note that due to something in version 3, we had to change the commands for scheduling the grab. If you have a version where there is a wg-cron file in your /config mount, delete it and use wg3-cron instead.**
+
  Below is the syntax of the cron file.

  ```
@ -55,11 +57,12 @@ app_setup_block: |
   │ │ │ │ │                                       7 is also Sunday on some systems)
   │ │ │ │ │
   │ │ │ │ │
-   * * * * *  s6-setuidgid abc /bin/bash /defaults/update.sh
+   * * * * *  /bin/bash /defaults/update.sh
  ```

 # changelog
 changelogs:
+  - { date: "29.03.20:", desc: "Update to v3.0.0. Changed to use wg3-cron file." }
  - { date: "28.05.19:", desc: "Update to v2.1.0 and beta v2.1.9, rebase to bionic." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "21.03.19:", desc: "Update to beta 2.1.7." }
--- a/root/defaults/WebGrab++.config.xml
+++ b/root/defaults/WebGrab++.config.xml
@ -1,16 +1,19 @@
 <?xml version="1.0"?>
 <settings>
   
-  <!-- for detailed info about the settings see http://webgrabplus.com/documentation/configuration/webgrabconfigxml -->
+  <!-- for detailed info about the settings see http://webgrabplus.com/documentation/configuration/webgrabconfigxml 
+  and http://webgrabplus.com/sites/default/files/downloads/Misc/Documented_Configuration_Files.zip -->
   
  <filename>/data/guide.xml</filename>
  <mode></mode>
-  <postprocess grab="y" run="n">mdb</postprocess>
-  <user-agent>Mozilla/5.0 (Windows NT 6.1; WOW64; rv:29.0) Gecko/20100101 Firefox/29.0</user-agent>
+  <postprocess grab="y" run="n">rex</postprocess>
+  <user-agent>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71</user-agent>
+  <!--<decryptkey site="site-name">decrypt_userkey</decryptkey>-->
+  <!--<license wg-username="your webgrab+plus username" registered-email="your registered email address" password="optional-password" />-->
  <logging>on</logging>
  <retry time-out="5">4</retry>
-  <timespan>8</timespan>
-  <update>i</update>
+  <timespan>0</timespan>
+  <update>f</update>
 
  <!--
            Replace the next dummy channel entry with the channels you want.
--- a/root/defaults/wg-cron
+++ b/root/defaults/wg-cron
@ -1 +0,0 @@
-2 3 * * * s6-setuidgid abc /bin/bash /defaults/update.sh
--- a/root/defaults/wg3-cron
+++ b/root/defaults/wg3-cron
@ -0,0 +1 @@
+2 3 * * * /bin/bash /defaults/update.sh
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@ -6,10 +6,13 @@
 [[ ! -e /config/siteini.pack ]] && \
 	cp -R /defaults/ini/siteini.pack /config/

+# warn user about changing name for crontab file
+echo "******** Please use the file wg3-cron to adjust the scheduled time for running WebGrab++. wg-cron can now be deleted. ********"
+
 # add cron file for running webgrab+plus
-[[ ! -e /config/wg-cron ]] && \
-	cp /defaults/wg-cron /config/wg-cron
-crontab /config/wg-cron
+[[ ! -e /config/wg3-cron ]] && \
+	cp /defaults/wg3-cron /config/wg3-cron
+crontab -u abc /config/wg3-cron

 # permissions
 chown -R abc:abc \
				`@ -1 +0,0 @@`
				`2 3 * * * s6-setuidgid abc /bin/bash /defaults/update.sh`