From 1d45ba858bbcd18860daf4f3e98117689f2bac29 Mon Sep 17 00:00:00 2001
From: melonarc <116148234+melonarc@users.noreply.github.com>
Date: Sun, 10 Mar 2024 12:50:06 +0100
Subject: [PATCH] setting MULTI_ARCH to false, sleep indefinitely on error

---
 .github/workflows/BuildImage.yml                  |  6 +++---
 .../s6-rc.d/init-mod-nextcloud-notify-push/run    | 15 ---------------
 .../s6-rc.d/init-mod-nextcloud-notify-push/type   |  1 -
 .../s6-rc.d/init-mod-nextcloud-notify-push/up     |  1 -
 .../dependencies.d/init-mod-nextcloud-notify-push |  0
 .../dependencies.d/init-services                  |  0
 .../s6-rc.d/svc-mod-nextcloud-notify-push/run     | 11 +++++++++++
 .../contents.d/init-mod-nextcloud-notify-push     |  0
 8 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/run
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/type
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/up
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-mod-nextcloud-notify-push
 rename root/etc/s6-overlay/s6-rc.d/{init-mod-nextcloud-notify-push => svc-mod-nextcloud-notify-push}/dependencies.d/init-services (100%)
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-notify-push

diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 38d81a0..e95a6e2 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -5,9 +5,9 @@ on: [push, pull_request_target, workflow_dispatch]
 env:
   GITHUB_REPO: "linuxserver/docker-mods" #don't modify
   ENDPOINT: "linuxserver/mods" #don't modify
-  BASEIMAGE: "nextcloud" #replace
-  MODNAME: "notify-push" #replace
-  MULTI_ARCH: "true" #set to false if not needed
+  BASEIMAGE: "nextcloud"
+  MODNAME: "notify-push"
+  MULTI_ARCH: "false"
 
 jobs:
   set-vars:
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/run b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/run
deleted file mode 100755
index 45a0691..0000000
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/run
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-NEXTCLOUD_BASE="/config/www/nextcloud"
-NOTIFY_PUSH_BIN="$NEXTCLOUD_BASE/apps/notify_push/bin/$(arch)/notify_push"
-
-# Check if notify-push is installed
-if [ ! -d "$NEXTCLOUD_BASE/apps/notify_push/" ]; then
-  echo "**** Notify-push folder not found. Download and install the notify-push/client-push app and restart the container. ****"
-  exit 1
-fi 
-# Check cpu arch
-if [ ! -f "$NOTIFY_PUSH_BIN" ]; then
-  echo "**** Did not find a matching notify-push binary for your cpu arch: $(arch) ****"
-  exit 1
-fi
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/type b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/type
deleted file mode 100644
index 3d92b15..0000000
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/up b/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/up
deleted file mode 100644
index 3783c02..0000000
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-mod-nextcloud-notify-push b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-mod-nextcloud-notify-push
deleted file mode 100644
index e69de29..0000000
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-services
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-mod-nextcloud-notify-push/dependencies.d/init-services
rename to root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-services
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/run
index 5c0284e..a960e33 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/run
@@ -5,6 +5,17 @@ export ALLOW_SELF_SIGNED=true
 NEXTCLOUD_BASE="/config/www/nextcloud"
 NOTIFY_PUSH_BIN="$NEXTCLOUD_BASE/apps/notify_push/bin/$(arch)/notify_push"
 
+# Check if notify-push is installed
+if [ ! -d "$NEXTCLOUD_BASE/apps/notify_push/" ]; then
+  echo "**** Notify-push folder not found. Install the notify-push/client-push app and restart the container. ****"
+  sleep infinity
+fi 
+# Check cpu arch
+if [ ! -f "$NOTIFY_PUSH_BIN" ]; then
+  echo "**** Did not find a matching notify-push binary for your cpu arch: $(arch) ****"
+  sleep infinity
+fi
+
 # run notify-push binary 
 echo "**** Starting notify-push ****"
 s6-setuidgid abc "$NOTIFY_PUSH_BIN" "$NEXTCLOUD_BASE/config/config.php"
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-notify-push b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-nextcloud-notify-push
deleted file mode 100644
index e69de29..0000000