From 7725c78aa694db00086e10711d717668bbff41b7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 12 Aug 2022 15:12:54 -0400 Subject: [PATCH 1/2] switch to hybrid --- .../dependencies.d/init-mods | 0 .../init-mod-lidarr-flac2mp3-add-package/run | 31 +++++++++++++++++++ .../init-mod-lidarr-flac2mp3-add-package/type | 1 + .../init-mod-lidarr-flac2mp3-add-package/up | 1 + .../init-mod-lidarr-flac2mp3-add-package | 0 .../init-mod-lidarr-flac2mp3-add-package | 0 root/usr/local/bin/flac2alac.sh | 0 root/usr/local/bin/flac2mp3-debug-2.sh | 0 root/usr/local/bin/flac2mp3-debug.sh | 0 root/usr/local/bin/flac2mp3-vbr.sh | 0 root/usr/local/bin/flac2mp3.sh | 0 root/usr/local/bin/flac2opus.sh | 0 12 files changed, 33 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lidarr-flac2mp3-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lidarr-flac2mp3-add-package mode change 100644 => 100755 root/usr/local/bin/flac2alac.sh mode change 100644 => 100755 root/usr/local/bin/flac2mp3-debug-2.sh mode change 100644 => 100755 root/usr/local/bin/flac2mp3-debug.sh mode change 100644 => 100755 root/usr/local/bin/flac2mp3-vbr.sh mode change 100644 => 100755 root/usr/local/bin/flac2mp3.sh mode change 100644 => 100755 root/usr/local/bin/flac2opus.sh diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/dependencies.d/init-mods new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run new file mode 100755 index 00000000..75e655ef --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run @@ -0,0 +1,31 @@ +#!/usr/bin/with-contenv bash + +cat <>> Flac2MP3 Mod by TheCaptain989 <<< +Repos: +Dev/test: https://github.com/TheCaptain989/lidarr-flac2mp3 +Prod: https://github.com/linuxserver/docker-mods/tree/lidarr-flac2mp3 + +Version: {{VERSION}} +---------------- +EOF + +# Determine if setup is needed +if [ ! -f /usr/bin/ffmpeg ]; then + echo "**** Adding ffmpeg to package install list ****" + echo "ffmpeg" >> /mod-repo-packages-to-install.list +fi + +# Change ownership +if [ $(stat -c '%G' /usr/local/bin/flac2mp3.sh) != "abc" ]; then + echo "Changing ownership on scripts." + chown abc:abc /usr/local/bin/flac2*.sh +fi + +# Make executable +if [ ! -x /usr/local/bin/flac2mp3.sh ]; then + echo "Making scripts executable." + chmod +x /usr/local/bin/flac2*.sh +fi + diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/type new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-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-lidarr-flac2mp3-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/up new file mode 100644 index 00000000..8078feca --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lidarr-flac2mp3-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-lidarr-flac2mp3-add-package new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lidarr-flac2mp3-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-lidarr-flac2mp3-add-package new file mode 100644 index 00000000..e69de29b diff --git a/root/usr/local/bin/flac2alac.sh b/root/usr/local/bin/flac2alac.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/bin/flac2mp3-debug-2.sh b/root/usr/local/bin/flac2mp3-debug-2.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/bin/flac2mp3-debug.sh b/root/usr/local/bin/flac2mp3-debug.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/bin/flac2mp3-vbr.sh b/root/usr/local/bin/flac2mp3-vbr.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/bin/flac2mp3.sh b/root/usr/local/bin/flac2mp3.sh old mode 100644 new mode 100755 diff --git a/root/usr/local/bin/flac2opus.sh b/root/usr/local/bin/flac2opus.sh old mode 100644 new mode 100755 From f5ab4d4ce80f0141e3b322b1a961d6fe7c3af599 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 27 Aug 2022 21:29:04 -0400 Subject: [PATCH 2/2] update version in log --- .github/workflows/BuildImage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index a5f465a1..0dc647ab 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -21,7 +21,10 @@ jobs: Building version $VERSION EOF # Insert version into scripts - sed -i -e "s/{{VERSION}}/$VERSION/" $GITHUB_WORKSPACE/root/usr/local/bin/flac2mp3.sh $GITHUB_WORKSPACE/root/etc/cont-init.d/98-flac2mp3 + sed -i -e "s/{{VERSION}}/$VERSION/" \ + $GITHUB_WORKSPACE/root/usr/local/bin/flac2mp3.sh \ + $GITHUB_WORKSPACE/root/etc/cont-init.d/98-flac2mp3 \ + $GITHUB_WORKSPACE/root/etc/s6-overlay/s6-rc.d/init-mod-lidarr-flac2mp3-add-package/run # Build image docker build --no-cache \ --tag ${{ github.sha }} .