From a51ad09b7b08ee2d4c47361d3f97b44733078f0a Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 22 Jul 2022 20:55:34 +0100
Subject: [PATCH 01/10] Add mod-init

---
 root/etc/s6-overlay/s6-rc.d/init-mods-end/type            | 1 +
 root/etc/s6-overlay/s6-rc.d/init-mods-end/up              | 1 +
 root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/base | 0
 root/etc/s6-overlay/s6-rc.d/init-mods/type                | 1 +
 root/etc/s6-overlay/s6-rc.d/init-mods/up                  | 1 +
 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods     | 0
 6 files changed, 4 insertions(+)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/base
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/type b/root/etc/s6-overlay/s6-rc.d/init-mods-end/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-end/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/up b/root/etc/s6-overlay/s6-rc.d/init-mods-end/up
new file mode 100644
index 0000000..092149d
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-end/up
@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the end of the mod init process
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods/type b/root/etc/s6-overlay/s6-rc.d/init-mods/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods/up b/root/etc/s6-overlay/s6-rc.d/init-mods/up
new file mode 100644
index 0000000..040d801
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods/up
@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the start of the mod init process
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods
new file mode 100644
index 0000000..e69de29

From 4af8d4292fad7fc653eedcafd6a0443edfc1f288 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sat, 23 Jul 2022 12:56:30 +0100
Subject: [PATCH 02/10] Add init-services anchor

---
 .../s6-rc.d/init-services/dependencies.d/init-mods-end           | 0
 root/etc/s6-overlay/s6-rc.d/init-services/type                   | 1 +
 root/etc/s6-overlay/s6-rc.d/init-services/up                     | 1 +
 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end        | 0
 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services        | 0
 5 files changed, 2 insertions(+)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-mods-end
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-services/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-services/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services

diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-mods-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/type b/root/etc/s6-overlay/s6-rc.d/init-services/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-services/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/up b/root/etc/s6-overlay/s6-rc.d/init-services/up
new file mode 100644
index 0000000..cd262c7
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-services/up
@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the start of the service init process
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services
new file mode 100644
index 0000000..e69de29

From 29c0ee219d252013099b67fa9f4b13cf168a7cec Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Tue, 26 Jul 2022 14:17:22 +0200
Subject: [PATCH 03/10] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index aa51db0..685a4be 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -4,7 +4,7 @@ alpine-keys-2.4-r1
 apk-tools-2.12.9-r3
 bash-5.1.16-r2
 brotli-libs-1.0.9-r6
-busybox-1.35.0-r15
+busybox-1.35.0-r16
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-9.1-r0
@@ -29,7 +29,7 @@ readline-8.1.2-r0
 scanelf-1.3.4-r0
 shadow-4.10-r3
 skalibs-2.11.2.0-r0
-ssl_client-1.35.0-r15
+ssl_client-1.35.0-r16
 tzdata-2022a-r0
 utmps-libs-0.1.2.0-r0
 xz-5.2.5-r1

From 201227b22035eba71155080433072db872c4d358 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 29 Jul 2022 18:00:22 +0100
Subject: [PATCH 04/10] Support universal package install

---
 .../dependencies.d/init-mods-package-install  |  0
 .../dependencies.d/init-mods                  |  0
 .../s6-rc.d/init-mods-package-install/run     | 35 +++++++++++++++++++
 .../s6-rc.d/init-mods-package-install/type    |  1 +
 .../s6-rc.d/init-mods-package-install/up      |  1 +
 .../user/contents.d/init-mods-package-install |  0
 6 files changed, 37 insertions(+)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods
 create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-package-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-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run
new file mode 100755
index 0000000..fb5b11d
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run
@@ -0,0 +1,35 @@
+#!/usr/bin/with-contenv bash
+
+if [ -f "/mod-repo-packages-to-install.list" ]; then
+    echo "**** Installing all mod packages ****"
+    if [ -f /usr/bin/apt ]; then
+        export DEBIAN_FRONTEND="noninteractive"
+        apt-get update
+        apt-get install -y --no-install-recommends \
+            $(cat /mod-repo-packages-to-install.list)
+    elif [ -f /sbin/apk ]; then
+        apk add --no-cache \
+            $(cat /mod-repo-packages-to-install.list)
+    fi
+fi
+
+if [ -f "/mod-pip-packages-to-install.list" ]; then
+    echo "**** Installing all pip packages ****"
+    python3 -m pip install -U pip wheel setuptools
+    if [ -f /usr/bin/apt ]; then
+        PIP_ARGS="-f https://wheel-index.linuxserver.io/ubuntu/"
+    elif [ -f /sbin/apk ]; then
+        ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||')
+        if [ "${ALPINE_VER}" = "3.14" ]; then
+            PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine/"
+        else
+            PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine-${ALPINE_VER}/"
+        fi
+    fi
+    python3 -m pip install ${PIP_ARGS} \
+        $(cat /mod-pip-packages-to-install.list)
+fi
+
+rm -rf \
+    /mod-repo-packages-to-install.list \
+    /mod-pip-packages-to-install.list
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up
new file mode 100644
index 0000000..fb63301
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mods-package-install/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-package-install
new file mode 100644
index 0000000..e69de29

From 42825ece45586d100a1b3fd7cd039ec2ff5d818f Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Sun, 31 Jul 2022 12:54:36 +0200
Subject: [PATCH 05/10] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 685a4be..92bb5be 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -5,8 +5,8 @@ apk-tools-2.12.9-r3
 bash-5.1.16-r2
 brotli-libs-1.0.9-r6
 busybox-1.35.0-r16
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
 coreutils-9.1-r0
 curl-7.83.1-r2
 gmp-6.2.1-r2

From 6ba2997eebdf4f57cc1c3048bcbaad854995b924 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Tue, 2 Aug 2022 08:34:58 +0200
Subject: [PATCH 06/10] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 92bb5be..a65bbb0 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -4,7 +4,7 @@ alpine-keys-2.4-r1
 apk-tools-2.12.9-r3
 bash-5.1.16-r2
 brotli-libs-1.0.9-r6
-busybox-1.35.0-r16
+busybox-1.35.0-r17
 ca-certificates-20220614-r0
 ca-certificates-bundle-20220614-r0
 coreutils-9.1-r0
@@ -29,7 +29,7 @@ readline-8.1.2-r0
 scanelf-1.3.4-r0
 shadow-4.10-r3
 skalibs-2.11.2.0-r0
-ssl_client-1.35.0-r16
+ssl_client-1.35.0-r17
 tzdata-2022a-r0
 utmps-libs-0.1.2.0-r0
 xz-5.2.5-r1

From b0a2852692b80b091dced311dd7fd45b6e4f184c Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Tue, 9 Aug 2022 01:36:56 -0500
Subject: [PATCH 07/10] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index a65bbb0..c187b3d 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -34,4 +34,4 @@ tzdata-2022a-r0
 utmps-libs-0.1.2.0-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r1
+zlib-1.2.12-r2

From 2edf79aab12c9b35bf215171167fb9db1b8e1b8c Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Tue, 16 Aug 2022 01:34:42 -0500
Subject: [PATCH 08/10] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index c187b3d..2f1d135 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -34,4 +34,4 @@ tzdata-2022a-r0
 utmps-libs-0.1.2.0-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r2
+zlib-1.2.12-r3

From 2de8130702798212a6f8456cf5a4e7cd6583fade Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 22 Aug 2022 09:16:25 -0500
Subject: [PATCH 09/10] Update 01-migrations

Fix broken bash syntax
---
 root/etc/cont-init.d/01-migrations | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/root/etc/cont-init.d/01-migrations b/root/etc/cont-init.d/01-migrations
index 4ab4464..aaf084a 100755
--- a/root/etc/cont-init.d/01-migrations
+++ b/root/etc/cont-init.d/01-migrations
@@ -5,25 +5,25 @@ MIGRATIONS_HISTORY="/config/.migrations"
 
 echo "[migrations] started"
 
-if [ ! -d $MIGRATIONS_DIR ]; then
+if [[ ! -d ${MIGRATIONS_DIR} ]]; then
   echo "[migrations] no migrations found"
   exit
 fi
 
-for MIGRATION in $(ls -1 ${MIGRATIONS_DIR}/* | sort -n); do
+for MIGRATION in $(find ${MIGRATIONS_DIR}/* | sort -n); do
   NAME="$(basename "${MIGRATION}")"
-  if [ -f $MIGRATIONS_HISTORY ] && grep -Fxq "$NAME" $MIGRATIONS_HISTORY; then
+  if [[ -f ${MIGRATIONS_HISTORY} ]] && grep -Fxq "${NAME}" ${MIGRATIONS_HISTORY}; then
     echo "[migrations] ${NAME}: skipped"
     continue
   fi
   echo "[migrations] ${NAME}: executing..."
-  chmod +x $MIGRATION
-  EXIT_CODE=$(/bin/bash ${MIGRATION}; echo $?)
-  if [ $EXIT_CODE -ne 0 ]; then
-    echo "[migrations] ${NAME}: failed with exit code $EXIT_CODE, contact support"
-    exit $EXIT_CODE
+  chmod +x "${MIGRATION}"
+  EXIT_CODE=$(/bin/bash "${MIGRATION}"; echo $?)
+  if [[ ${EXIT_CODE} -ne 0 ]]; then
+    echo "[migrations] ${NAME}: failed with exit code ${EXIT_CODE}, contact support"
+    exit "${EXIT_CODE}"
   fi
-  echo $NAME >> $MIGRATIONS_HISTORY
+  echo "${NAME}" >> ${MIGRATIONS_HISTORY}
   echo "[migrations] ${NAME}: succeeded"
 done
 

From d8547ab363121f8acb487a045a96d3fc4219932f Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Tue, 23 Aug 2022 08:42:30 +0200
Subject: [PATCH 10/10] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 2f1d135..daa41bd 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -30,7 +30,7 @@ scanelf-1.3.4-r0
 shadow-4.10-r3
 skalibs-2.11.2.0-r0
 ssl_client-1.35.0-r17
-tzdata-2022a-r0
+tzdata-2022c-r0
 utmps-libs-0.1.2.0-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1