From ec7705f5fc6598f4777585ed9f42211bd2233d05 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sat, 2 Jul 2022 22:09:33 +0200
Subject: [PATCH] Added error handeling for init.sh

---
 CT-Build/Alpine.yaml                    | 2 +-
 CT-Build/Debian.yaml                    | 2 +-
 CT-Files/aptcacherng/Scripts/Init.sh    | 2 +-
 CT-Files/domoticz/Scripts/Init.sh       | 2 +-
 CT-Files/duplicati/Scripts/Init.sh      | 2 +-
 CT-Files/elkarbackupALP/Scripts/Init.sh | 2 +-
 CT-Files/elkarbackupDEB/Scripts/Init.sh | 2 +-
 CT-Files/mailbackup/Scripts/Init.sh     | 5 ++---
 CT-Files/mysql/Scripts/Init.sh          | 2 +-
 CT-Files/nextcloud/Scripts/Init.sh      | 2 +-
 CT-Files/nginx/Scripts/Init.sh          | 2 +-
 CT-Files/omadaV3/Scripts/Init.sh        | 2 +-
 CT-Files/transfersh/Scripts/Init.sh     | 3 +--
 13 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index a7b37bf..293d359 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -667,7 +667,7 @@ actions:
 - trigger: post-files
   action: |-
     #!/bin/sh
-    ash /opt/Setup/Scripts/Init.sh
+    ash /opt/Setup/Scripts/Init.sh || exit 1
     rm /opt/Setup/Scripts/Init.sh
   variants:
   - gitea
diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml
index 386f9df..34f5763 100644
--- a/CT-Build/Debian.yaml
+++ b/CT-Build/Debian.yaml
@@ -1469,7 +1469,7 @@ actions:
 - trigger: post-files
   action: |-
     #!/bin/sh
-    bash /opt/Setup/Scripts/Init.sh
+    bash /opt/Setup/Scripts/Init.sh  || exit 1
     rm /opt/Setup/Scripts/Init.sh
   variants:
   - mysql
diff --git a/CT-Files/aptcacherng/Scripts/Init.sh b/CT-Files/aptcacherng/Scripts/Init.sh
index 2920c5b..4ae1dc9 100644
--- a/CT-Files/aptcacherng/Scripts/Init.sh
+++ b/CT-Files/aptcacherng/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 http://dl-4.alpinelinux.org/alpine/MIRRORS.txt -o /etc/apt-cacher-ng/alpine_mirrors
+curl -L --retry 7 --retry-delay 5 http://dl-4.alpinelinux.org/alpine/MIRRORS.txt -o /etc/apt-cacher-ng/alpine_mirrors  || exit 1
 curl -L --retry 7 --retry-delay 5 https://www.centos.org/download/full-mirrorlist.csv | sed 's/^.*"http:/http:/' | sed 's/".*$//' | grep ^http > /etc/apt-cacher-ng/centos_mirrors
 #Allow apt-cacher-ng to use port 80
 setcap 'cap_net_bind_service=+ep' /usr/sbin/apt-cacher-ng
diff --git a/CT-Files/domoticz/Scripts/Init.sh b/CT-Files/domoticz/Scripts/Init.sh
index b20cb52..3499a14 100644
--- a/CT-Files/domoticz/Scripts/Init.sh
+++ b/CT-Files/domoticz/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz -o "/opt/Setup/domoticz.tgz"
+curl -L --retry 7 --retry-delay 5 https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz -o "/opt/Setup/domoticz.tgz"  || exit 1
 
 #Adding service user
 adduser --system --shell /bin/bash --group --disabled-password --home /home/domoticz domoticz
diff --git a/CT-Files/duplicati/Scripts/Init.sh b/CT-Files/duplicati/Scripts/Init.sh
index 5341ec7..f2d4cfb 100644
--- a/CT-Files/duplicati/Scripts/Init.sh
+++ b/CT-Files/duplicati/Scripts/Init.sh
@@ -5,7 +5,7 @@ CurrentVersion=$(curl -s https://api.github.com/repos/duplicati/duplicati/releas
 ##Duplicati get older version (Working with only the runtime installed)
 #CurrentVersion="v2.0.5.1-2.0.5.1_beta_2020-01-18"
 echo $CurrentVersion > /opt/Duplicati-installed
-curl -L --retry 7 --retry-delay 5 $(curl -s https://api.github.com/repos/duplicati/duplicati/releases/tags/"$CurrentVersion" | grep browser_download_url | grep .zip |grep -v signatures | sed -e s#^.*https#https# | tr -d \") -o /opt/Setup/duplicati.zip
+curl -L --retry 7 --retry-delay 5 $(curl -s https://api.github.com/repos/duplicati/duplicati/releases/tags/"$CurrentVersion" | grep browser_download_url | grep .zip |grep -v signatures | sed -e s#^.*https#https# | tr -d \") -o /opt/Setup/duplicati.zip || exit 1
 
 #Extract duplicati
 unzip  /opt/Setup/duplicati.zip -d /opt/duplicati
diff --git a/CT-Files/elkarbackupALP/Scripts/Init.sh b/CT-Files/elkarbackupALP/Scripts/Init.sh
index 51b6c82..95c4fef 100644
--- a/CT-Files/elkarbackupALP/Scripts/Init.sh
+++ b/CT-Files/elkarbackupALP/Scripts/Init.sh
@@ -2,7 +2,7 @@
 #Get Resources
 CurrentVersion=$(curl -s https://api.github.com/repos/elkarbackup/elkarbackup/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 echo $CurrentVersion > /opt/Elkarbackup-installed
-curl -L --retry 7 --retry-delay 5 https://github.com/elkarbackup/elkarbackup/archive/refs/tags/$CurrentVersion.tar.gz -o /opt/Setup/elkb.tar.gz
+curl -L --retry 7 --retry-delay 5 https://github.com/elkarbackup/elkarbackup/archive/refs/tags/$CurrentVersion.tar.gz -o /opt/Setup/elkb.tar.gz || exit 1
 
 #Install Composer
 EXPECTED_CHECKSUM="$(curl -L https://composer.github.io/installer.sig)"
diff --git a/CT-Files/elkarbackupDEB/Scripts/Init.sh b/CT-Files/elkarbackupDEB/Scripts/Init.sh
index c6f6d4f..20fdb88 100644
--- a/CT-Files/elkarbackupDEB/Scripts/Init.sh
+++ b/CT-Files/elkarbackupDEB/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 http://ftp.debian.org/debian/pool/main/r/rsnapshot/rsnapshot_1.4.2-1_all.deb -o /opt/Setup/rsnapshot.deb
+curl -L --retry 7 --retry-delay 5 http://ftp.debian.org/debian/pool/main/r/rsnapshot/rsnapshot_1.4.2-1_all.deb -o /opt/Setup/rsnapshot.deb || exit 1
 #Install elkarbackup
 apt install /opt/Setup/rsnapshot.deb elkarbackup -y
 echo "Apt intall being unable to configure elkarbackup is expected"
diff --git a/CT-Files/mailbackup/Scripts/Init.sh b/CT-Files/mailbackup/Scripts/Init.sh
index 84d586e..3cda3e4 100644
--- a/CT-Files/mailbackup/Scripts/Init.sh
+++ b/CT-Files/mailbackup/Scripts/Init.sh
@@ -1,13 +1,12 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 GetAddr -o /opt/Setup/File
 git clone https://git.bprieshof.nl/Tools/MailBackup-sys.git /opt/Setup/MailBackup-sys
 CurrentVersion=$(curl -s https://api.github.com/repos/RainLoop/rainloop-webmail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 echo $CurrentVersion > /opt/Setup/rainloop-installed
-curl -L --retry 7 --retry-delay 5  http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /opt/Setup/rlcl.zip
+curl -L --retry 7 --retry-delay 5  http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /opt/Setup/rlcl.zip || exit 1
 echo "$OfflineIMAPVer" > CT-Files/mailbackup/OfflineIMAP3-installed
-curl -L --retry 7 --retry-delay 5 https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /opt/Setup/olim3.tar.gz
+curl -L --retry 7 --retry-delay 5 https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /opt/Setup/olim3.tar.gz || exit 1
 
 #Install and configure using git.bprieshof.nl MailBackup-sys
 DistoBuilderINT=true ResourceFolder=/opt/Setup ash /opt/Setup/MailBackup-sys/install.sh
diff --git a/CT-Files/mysql/Scripts/Init.sh b/CT-Files/mysql/Scripts/Init.sh
index cc3990d..c8e6d0c 100644
--- a/CT-Files/mysql/Scripts/Init.sh
+++ b/CT-Files/mysql/Scripts/Init.sh
@@ -2,7 +2,7 @@
 #Get Resources
 CurrentVersion=$(curl -s https://api.github.com/repos/phpmyadmin/phpmyadmin/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 echo $CurrentVersion > /opt/phpmyadmin-installed
-curl -L --retry 7 --retry-delay 5 "$GetAddr" -o "/opt/Setup/phpmyadmin.tar.gz"
+curl -L --retry 7 --retry-delay 5 https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-english.tar.gz -o "/opt/Setup/phpmyadmin.tar.gz" || exit 1
 
 #Configure MySQL
 rm -rf /etc/mysql/ /etc/my.cnf.d/ /etc/my.cnf
diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh
index e4fa843..bd60d0a 100644
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 https://download.nextcloud.com/server/releases/latest.tar.bz2 -o /opt/Setup/nextcloud.tar.bz2
+curl -L --retry 7 --retry-delay 5 https://download.nextcloud.com/server/releases/latest.tar.bz2 -o /opt/Setup/nextcloud.tar.bz2 || exit 1
 
 #Configure Nginx
 rm -rf /etc/nginx/conf.d
diff --git a/CT-Files/nginx/Scripts/Init.sh b/CT-Files/nginx/Scripts/Init.sh
index e4839b3..ee9a8f6 100644
--- a/CT-Files/nginx/Scripts/Init.sh
+++ b/CT-Files/nginx/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 https://codeload.github.com/acmesh-official/acme.sh/tar.gz/master -o /opt/Setup/Fileacmesh.tar.gz
+curl -L --retry 7 --retry-delay 5 https://codeload.github.com/acmesh-official/acme.sh/tar.gz/master -o /opt/Setup/Fileacmesh.tar.gz || exit 1
 
 #Configure Nginx
 mkdir -p /etc/nginx/sites-available /etc/nginx/sites-enabled /etc/nginx/snippets /etc/nginx/modules-available /etc/nginx/modules-enabled /etc/nginx/snippets/
diff --git a/CT-Files/omadaV3/Scripts/Init.sh b/CT-Files/omadaV3/Scripts/Init.sh
index 8945000..ff9c444 100644
--- a/CT-Files/omadaV3/Scripts/Init.sh
+++ b/CT-Files/omadaV3/Scripts/Init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 https://static.tp-link.com/2020/202012/20201225/Omada_v3.2.14_linux_x64.deb -o /opt/Setup/omada.deb
+curl -L --retry 7 --retry-delay 5 https://static.tp-link.com/2020/202012/20201225/Omada_v3.2.14_linux_x64.deb -o /opt/Setup/omada.deb || exit 1
 #Install Omada
 apt install /opt/Setup/omada.deb -y
 rm /opt/Setup/omada.deb
\ No newline at end of file
diff --git a/CT-Files/transfersh/Scripts/Init.sh b/CT-Files/transfersh/Scripts/Init.sh
index b6e68ea..62d1438 100644
--- a/CT-Files/transfersh/Scripts/Init.sh
+++ b/CT-Files/transfersh/Scripts/Init.sh
@@ -1,9 +1,8 @@
 #!/bin/ash
 #Get Resources
-curl -L --retry 7 --retry-delay 5 GetAddr -o /opt/Setup/File
 CurrentVersion=$(curl -s https://api.github.com/repos/dutchcoders/transfer.sh/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 echo $CurrentVersion > /opt/transfer.sh/Version
-curl -L --retry 7 --retry-delay 5 https://github.com/dutchcoders/transfer.sh/releases/download/"$CurrentVersion"/transfersh-"$CurrentVersion"-linux-amd64 -o /opt/transfer.sh/transfersh-linux-amd64
+curl -L --retry 7 --retry-delay 5 https://github.com/dutchcoders/transfer.sh/releases/download/"$CurrentVersion"/transfersh-"$CurrentVersion"-linux-amd64 -o /opt/transfer.sh/transfersh-linux-amd64 || exit 1
 
 #Setup
 addgroup transfersh