From 6ca8d57b8a547ca0c9b5b21fa20bbddaec9149eb Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Thu, 12 Sep 2024 00:27:55 +0200 Subject: [PATCH] Script AlpinePHPTool: Fixed incorrect variable and error catching --- Scripts/AlpinePHPTool.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Scripts/AlpinePHPTool.sh b/Scripts/AlpinePHPTool.sh index 5d05cf9..1117eb2 100644 --- a/Scripts/AlpinePHPTool.sh +++ b/Scripts/AlpinePHPTool.sh @@ -50,6 +50,11 @@ set_mode () { mode=$1 } +echo_exit (){ + echo + exit 1 +} + #Arugment/optin handeling while getopts 'dfpuh' opt; do case $opt in @@ -133,12 +138,12 @@ fetch_Config() { #Unique settings for configuration case $config in mailbackup) - wget https://git.bprieshof.nl/Tools/MailBackup-sys/raw/branch/alpine/Configs/php.conf -O /tmp/php.conf || echo "ERROR: Config download failed";exit 1 - wget https://git.bprieshof.nl/Tools/MailBackup-sys/raw/branch/alpine/Configs/php.pkglist -O /tmp/php.pkglist || echo "ERROR: Config download failed";exit 1 + wget https://git.bprieshof.nl/Tools/MailBackup-sys/raw/branch/alpine/Configs/php.conf -O /tmp/php.conf || echo_exit "ERROR: Config download failed" + wget https://git.bprieshof.nl/Tools/MailBackup-sys/raw/branch/alpine/Configs/php.pkglist -O /tmp/php.pkglist || echo_exit "ERROR: Config download failed" ;; *) - wget "$repo"/raw/branch/"$branch"/CT-Files/$config/Configs/php.conf -O /tmp/php.conf || echo "ERROR: Config download failed";exit 1 - wget "$repo"/raw/branch/"$branch"/CT-Files/"$config"/Configs/php.pkglist -O /tmp/php.pkglist || echo "ERROR: Config download failed";exit 1 + wget "$gitRepo"/raw/branch/"$gitBranch"/CT-Files/$config/Configs/php.conf -O /tmp/php.conf || echo_exit "ERROR: Config download failed" + wget "$gitRepo"/raw/branch/"$gitBranch"/CT-Files/"$config"/Configs/php.pkglist -O /tmp/php.pkglist || echo_exit "ERROR: Config download failed" ;; esac