diff --git a/scripts/installer.sh b/scripts/installer.sh index db029724f..9e48732da 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -14,7 +14,6 @@ readonly CLOUDRON_CONF=/home/yellowtent/configs/cloudron.conf readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly box_src_tmp_dir="$(realpath ${script_dir}/..)" readonly json="${script_dir}/../../node_modules/.bin/json" -readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 300" readonly is_update=$([[ -f "${CLOUDRON_CONF}" ]] && echo "yes" || echo "no") diff --git a/src/scripts/update.sh b/src/scripts/update.sh index f6bafdc62..c5a8ae29c 100755 --- a/src/scripts/update.sh +++ b/src/scripts/update.sh @@ -9,6 +9,7 @@ fi readonly UPDATER_SERVICE="cloudron-updater" readonly DATA_FILE="/tmp/cloudron-update-data.json" +readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 300" if [[ $# == 1 && "$1" == "--check" ]]; then echo "OK" @@ -32,7 +33,7 @@ readonly installer_path="${box_src_tmp_dir}/scripts/installer.sh" echo "Downloading box code from ${sourceTarballUrl} to ${box_src_tmp_dir}" for try in `seq 1 10`; do - if curl -L "${sourceTarballUrl}" | tar -zxf - -C "${box_src_tmp_dir}"; then break; fi + if $curl -L "${sourceTarballUrl}" | tar -zxf - -C "${box_src_tmp_dir}"; then break; fi echo "Failed to download source tarball, trying again" sleep 5 done