julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bring in changes from stable

Browse Source
This commit is contained in:
Heavybullets8 2022-07-24 19:15:56 -06:00
parent 993475135b
commit 1af355a8f6
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
heavy_script.sh
View File

@ -3,34 +3,34 @@
#If no argument is passed, kill the script. #If no argument is passed, kill the script.
[[ -z "$*" || "-" == "$*" || "--" == "$*" ]] && echo "This script requires an argument, use --help for help" && exit [[ -z "$*" || "-" == "$*" || "--" == "$*" ]] && echo "This script requires an argument, use --help for help" && exit
echo "yep"
args=("$@") args=("$@")
self_update() { self_update() {
SCRIPT=$(readlink -f "$0") script=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT") script_path=$(dirname "$script")
SCRIPTNAME="$0" script_name="heavy_script.sh"
cd $SCRIPTPATH cd "$script_path" || exit
git fetch &> /dev/null git fetch &> /dev/null
[[ -n $(git diff --name-only origin/beta | grep $SCRIPTNAME) ]] && { if git diff --name-only origin/main | grep -q "$script_name" ; then
echo "Found a new version of HeavyScript, updating myself..." echo "Found a new version of HeavyScript, updating myself..."
git pull --force &> /dev/null git reset --hard -q
git pull --force -q
echo -e "Running the new version...\n" echo -e "Running the new version...\n"
count=0 count=0
for i in "${args[@]}" for i in "${args[@]}"
do do
[[ "$i" == "--self-update" ]] && unset "args[$count]" && break [[ "$i" == "--self-update" ]] && unset "args[$count]" && break
((count++)) ((count++))
done done
sleep 5 sleep 5
exec bash "$SCRIPTNAME" "${args[@]}" exec bash "$script_name" "${args[@]}"
# Now exit this old instance # Now exit this old instance
exit 1 exit
} else
echo -e "Already the latest version.\n" echo -e "HeavyScript is already the latest version\n"
fi
} }
@ -59,7 +59,7 @@ echo "Examples"
echo "bash heavy_script.sh -b 14 -i portainer -i arch -i sonarr -i radarr -t 600 -vrsUp" echo "bash heavy_script.sh -b 14 -i portainer -i arch -i sonarr -i radarr -t 600 -vrsUp"
echo "bash /mnt/tank/scripts/heavy_script.sh -t 150 --mount" echo "bash /mnt/tank/scripts/heavy_script.sh -t 150 --mount"
echo "bash /mnt/tank/scripts/heavy_script.sh --dns" echo "bash /mnt/tank/scripts/heavy_script.sh --dns"
echo "bash /mnt/tank/scripts/heavy_script.sh --restore" echo "bash heavy_script.sh --restore"
echo "bash /mnt/tank/scripts/heavy_script.sh --delete-backup" echo "bash /mnt/tank/scripts/heavy_script.sh --delete-backup"
echo echo
exit exit
@ -218,7 +218,9 @@ export -f sync
update_apps(){ update_apps(){
mapfile -t array < <(cli -m csv -c 'app chart_release query name,update_available,human_version,human_latest_version,container_images_update_available,status' | grep -E ",true(,|$)" | sort) # Replace with line below after testing
# cli -m csv -c 'app chart_release query name,update_available,human_version,human_latest_version,container_images_update_available,status' | tr -d " \t\r" | grep -E ",true($|,)" | sort
mapfile -t array < <(cli -m csv -c 'app chart_release query name,update_available,human_version,human_latest_version,container_images_update_available,status' | grep -E ",true(,|\b)" | sort)
[[ -z $array ]] && echo -e "\nThere are no updates available" && return 0 || echo -e "\n${#array[@]} update(s) available" [[ -z $array ]] && echo -e "\nThere are no updates available" && return 0 || echo -e "\n${#array[@]} update(s) available"
[[ -z $timeout ]] && echo -e "\nDefault Timeout: 500" && timeout=500 || echo -e "\nCustom Timeout: $timeout" [[ -z $timeout ]] && echo -e "\nDefault Timeout: 500" && timeout=500 || echo -e "\nCustom Timeout: $timeout"
[[ "$timeout" -le 120 ]] && echo "Warning: Your timeout is set low and may lead to premature rollbacks or skips" [[ "$timeout" -le 120 ]] && echo "Warning: Your timeout is set low and may lead to premature rollbacks or skips"
@ -269,7 +271,7 @@ do
else #user must not be using -S, just update else #user must not be using -S, just update
echo -e "\n$app_name" echo -e "\n$app_name"
[[ "$verbose" == "true" ]] && echo "Updating.." [[ "$verbose" == "true" ]] && echo "Updating.."
cli -c 'app chart_release upgrade release_name=''"'"$app_name"'"' &> /dev/null && echo -e "Updated\n$old_full_ver\n$new_full_ver" && after_update_actions || { echo "FAILED"; continue; } cli -c 'app chart_release upgrade release_name=''"'"$app_name"'"' &> /dev/null && echo -e "Updated\n$old_full_ver\n$new_full_ver" && after_update_actions || echo "FAILED"
fi fi
else else
echo -e "\n$app_name\nMajor Release, update manually" echo -e "\n$app_name\nMajor Release, update manually"
@ -372,10 +374,10 @@ do
case $opt in case $opt in
-) -)
case "${OPTARG}" in case "${OPTARG}" in
help) help)
help="true" help="true"
;; ;;
self-update) self-update)
self_update="true" self_update="true"
;; ;;
dns) dns)
@ -455,8 +457,8 @@ done
[[ "$update_all_apps" == "true" && "$update_apps" == "true" ]] && echo -e "-U and -u cannot BOTH be called" && exit [[ "$update_all_apps" == "true" && "$update_apps" == "true" ]] && echo -e "-U and -u cannot BOTH be called" && exit
#Continue to call functions in specific order #Continue to call functions in specific order
[[ "$self_update" == "true" ]] && self_update
[[ "$help" == "true" ]] && help [[ "$help" == "true" ]] && help
[[ "$self_update" == "true" ]] && self_update
[[ "$deleteBackup" == "true" ]] && deleteBackup && exit [[ "$deleteBackup" == "true" ]] && deleteBackup && exit
[[ "$dns" == "true" ]] && dns && exit [[ "$dns" == "true" ]] && dns && exit
[[ "$restore" == "true" ]] && restore && exit [[ "$restore" == "true" ]] && restore && exit