From 1db4c18d88bb92994c2becfe28cd5e3eeae44b0e Mon Sep 17 00:00:00 2001 From: Heavybullets8 Date: Thu, 18 Aug 2022 20:56:40 -0600 Subject: [PATCH] prepare for PR --- functions/self_update.sh | 2 +- functions/update_apps.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/self_update.sh b/functions/self_update.sh index b7b3e884..26b2fd56 100644 --- a/functions/self_update.sh +++ b/functions/self_update.sh @@ -2,7 +2,7 @@ args=("$@") self_update() { -branch="ignore-file" +branch="main" git fetch &> /dev/null echo "🅂 🄴 🄻 🄵" echo "🅄 🄿 🄳 🄰 🅃 🄴" diff --git a/functions/update_apps.sh b/functions/update_apps.sh index 0f26acce..a32dc4a9 100644 --- a/functions/update_apps.sh +++ b/functions/update_apps.sh @@ -133,7 +133,6 @@ do update_avail=$(grep "^$app_name," all_app_status | awk -F ',' '{print $3}') if [[ $update_avail == "true" ]]; then if ! cli -c 'app chart_release upgrade release_name=''"'"$app_name"'"' &> /dev/null ; then - echo "Fail Trigger - Debugging" before_loop=$(head -n 1 all_app_status) current_loop=0 until [[ "$(grep "^$app_name," all_app_status | awk -F ',' '{print $3}')" != "$update_avail" ]] # Wait for a specific change to app status, or 3 refreshes of the file to go by. @@ -166,7 +165,6 @@ do if [[ $count -gt 2 ]]; then # If failed to stop app 3 times, return failure to parent shell return 1 elif ! cli -c 'app chart_release scale release_name='\""$app_name"\"\ 'scale_options={"replica_count": 0}' &> /dev/null ; then - echo "Fail Trigger Stop - Debugging" before_loop=$(head -n 1 all_app_status) ((count++)) until [[ $(head -n 1 all_app_status) != "$before_loop" ]] # Upon failure, wait for status update before continuing