From 554540b34ddddbb9adf56dda29bb54e0591c849e Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 12:54:10 -0400 Subject: [PATCH 1/3] switch to hybrid --- .../dependencies.d/init-mods | 0 .../run | 8 ++++ .../type | 1 + .../up | 1 + .../dependencies.d/init-mods-package-install | 0 .../init-mod-plex-absolute-hama-install/run | 38 +++++++++++++++++++ .../init-mod-plex-absolute-hama-install/type | 1 + .../init-mod-plex-absolute-hama-install/up | 1 + .../init-mod-plex-absolute-hama-install | 0 .../init-mod-plex-absolute-hama-add-package | 0 .../init-mod-plex-absolute-hama-add-package | 0 .../init-mod-plex-absolute-hama-install | 0 12 files changed, 50 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/dependencies.d/init-mods-package-install create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-plex-absolute-hama-install create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-plex-absolute-hama-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run new file mode 100755 index 0000000..daf09ac --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +if [ -z `command -v git` ]; then + echo "**** adding plex-hama-absolute deps to package install list ****" + echo "git" >> /mod-repo-packages-to-install.list +else + echo "**** plex-hama-absolute deps already installed, skipping ****" +fi \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/up new file mode 100644 index 0000000..53b2be3 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/dependencies.d/init-mods-package-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run new file mode 100755 index 0000000..60f3750 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run @@ -0,0 +1,38 @@ +#!/usr/bin/with-contenv bash + +# clone or update Absolute Series Scanner repo +if [ ! -d /config/absolute ]; then + echo "**** no scanner repo found, cloning. ****" + s6-setuidgid abc git clone --depth 1 https://github.com/ZeroQI/Absolute-Series-Scanner /config/absolute +else + echo "**** updating scanner repo ****" + s6-setuidgid abc git -C /config/absolute pull +fi +chown -R abc:abc /config/absolute + +scannerdir="/config/Library/Application Support/Plex Media Server/Scanners/Series" +mkdir -p "$scannerdir" + +# copy the scanner if missing or out of date +if [ ! -f "$scannerdir/Absolute Series Scanner.py" ]; then + echo "**** no scanner found. copying from repo ****" + cp -f "/config/absolute/Scanners/Series/Absolute Series Scanner.py" "$scannerdir/Absolute Series Scanner.py" +else + if [ $(date -r "$scannerdir/Absolute Series Scanner.py" +%s) -lt $(date -r "/config/absolute/Scanners/Series/Absolute Series Scanner.py" +%s) ]; then + echo "**** scanner out of date, copying latest version ****" + cp -f "/config/absolute/Scanners/Series/Absolute Series Scanner.py" "$scannerdir/Absolute Series Scanner.py" + fi +fi +chown -R abc:abc "$scannerdir" + +plugindir="/config/Library/Application Support/Plex Media Server/Plug-ins" + +# clone or update Hama.bundle repo +if [ ! -d "$plugindir/Hama.bundle" ]; then + echo "**** no agent found, cloning ****" + s6-setuidgid abc git clone --depth 1 https://github.com/ZeroQI/Hama.bundle "$plugindir/Hama.bundle" +else + echo "**** pulling latest update ****" + s6-setuidgid abc git -C "$plugindir/Hama.bundle" pull +fi +chown -R abc:abc "$plugindir/Hama.bundle" diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/up new file mode 100644 index 0000000..f17aeff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-plex-absolute-hama-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-plex-absolute-hama-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-plex-absolute-hama-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-plex-absolute-hama-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-plex-absolute-hama-install new file mode 100644 index 0000000..e69de29 From da848a6a9d7fbcc1ad2b1f9d8a3f5d5dc3fbb79e Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 12:55:31 -0400 Subject: [PATCH 2/3] fix typo --- .../s6-rc.d/init-mod-plex-absolute-hama-add-package/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run index daf09ac..eea9485 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-add-package/run @@ -1,8 +1,8 @@ #!/usr/bin/with-contenv bash if [ -z `command -v git` ]; then - echo "**** adding plex-hama-absolute deps to package install list ****" + echo "**** adding plex-absolute-hama deps to package install list ****" echo "git" >> /mod-repo-packages-to-install.list else - echo "**** plex-hama-absolute deps already installed, skipping ****" + echo "**** plex-absolute-hama deps already installed, skipping ****" fi \ No newline at end of file From 7a54488a558ae6f8e3a7a0f520ea8964aa1733fb Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 5 Sep 2022 21:08:33 -0400 Subject: [PATCH 3/3] fix first time install --- .../s6-rc.d/init-mod-plex-absolute-hama-install/run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run index 60f3750..54dedbc 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-plex-absolute-hama-install/run @@ -10,8 +10,13 @@ else fi chown -R abc:abc /config/absolute +if [ ! -d "/config/Library/Application Support/Plex Media Server" ]; then + echo "**** Creating Scanner and Plug-ins folders ****" + mkdir -p "/config/Library/Application Support/Plex Media Server/Scanners/Series" "/config/Library/Application Support/Plex Media Server/Plug-ins" + chown -R abc:abc "/config/Library/Application Support/Plex Media Server" +fi + scannerdir="/config/Library/Application Support/Plex Media Server/Scanners/Series" -mkdir -p "$scannerdir" # copy the scanner if missing or out of date if [ ! -f "$scannerdir/Absolute Series Scanner.py" ]; then