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

polish messages

Browse Source
This commit is contained in:
Heavybullets8 2022-07-26 17:43:06 -06:00
parent bd5569457b
commit 882f4033c9
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/backup.sh
View File

@ -8,7 +8,7 @@ date=$(date '+%Y_%m_%d_%H_%M_%S')
[[ -z "$verbose" ]] && echo_backup+=("\nNew Backup Name:") && cli -c 'app kubernetes backup_chart_releases backup_name=''"'HeavyScript_"$date"'"' | tail -n 1 &> /dev/null && echo_backup+=(HeavyScript_"$date") [[ -z "$verbose" ]] && echo_backup+=("\nNew Backup Name:") && cli -c 'app kubernetes backup_chart_releases backup_name=''"'HeavyScript_"$date"'"' | tail -n 1 &> /dev/null && echo_backup+=(HeavyScript_"$date")
mapfile -t list_backups < <(cli -c 'app kubernetes list_backups' | grep "HeavyScript_" | sort -t '_' -Vr -k2,7 | awk -F '|' '{print $2}'| tr -d " \t\r") mapfile -t list_backups < <(cli -c 'app kubernetes list_backups' | grep "HeavyScript_" | sort -t '_' -Vr -k2,7 | awk -F '|' '{print $2}'| tr -d " \t\r")
if [[ ${#list_backups[@]} -gt "number_of_backups" ]]; then if [[ ${#list_backups[@]} -gt "number_of_backups" ]]; then
echo_backup+=("\nDeleting the oldest backup(s) for exceeding limit:") echo_backup+=("\nDeleted the oldest backup(s) for exceeding limit:")
overflow=$(( ${#list_backups[@]} - "$number_of_backups" )) overflow=$(( ${#list_backups[@]} - "$number_of_backups" ))
mapfile -t list_overflow < <(cli -c 'app kubernetes list_backups' | grep "HeavyScript_" | sort -t '_' -V -k2,7 | awk -F '|' '{print $2}'| tr -d " \t\r" | head -n "$overflow") mapfile -t list_overflow < <(cli -c 'app kubernetes list_backups' | grep "HeavyScript_" | sort -t '_' -V -k2,7 | awk -F '|' '{print $2}'| tr -d " \t\r" | head -n "$overflow")
for i in "${list_overflow[@]}" for i in "${list_overflow[@]}"

2
functions/menu.sh
View File

@ -128,6 +128,8 @@ menu(){
read -rt 600 -p "Please type the number associated with the flag above: " current_selection read -rt 600 -p "Please type the number associated with the flag above: " current_selection
if [[ $current_selection == 0 ]]; then if [[ $current_selection == 0 ]]; then
clear -x
echo "Running \"bash heavy_script.sh ${update_selection[*]}\""
exec bash "$script_name" "${update_selection[@]}" exec bash "$script_name" "${update_selection[@]}"
exit exit
elif [[ $current_selection == 1 ]]; then elif [[ $current_selection == 1 ]]; then

2
functions/misc.sh
View File

@ -2,7 +2,7 @@
sync(){ sync(){
echo_sync+=("\nSyncing all catalogs, please wait..") && cli -c 'app catalog sync_all' &> /dev/null && echo_sync+=("Catalog sync complete") cli -c 'app catalog sync_all' &> /dev/null && echo_sync+=("Catalog sync complete")
#Dump the echo_array, ensures all output is in a neat order. #Dump the echo_array, ensures all output is in a neat order.
for i in "${echo_sync[@]}" for i in "${echo_sync[@]}"

5
heavy_script.sh
View File

@ -139,7 +139,10 @@ done
[[ "$restore" == "true" ]] && restore && exit [[ "$restore" == "true" ]] && restore && exit
[[ "$mount" == "true" ]] && mount && exit [[ "$mount" == "true" ]] && mount && exit
if [[ "$number_of_backups" -ge 1 && "$sync" == "true" ]]; then # Run backup and sync at the same time if [[ "$number_of_backups" -ge 1 && "$sync" == "true" ]]; then # Run backup and sync at the same time
echo -e "Backing up and syncing catalogs at the same time, please wait for output..\n" echo "Running the following two tasks at the same time"
echo "------------------------------------------------"
echo -e "Backing up ix-applications dataset\nSyncing catalog(s)"
echo -e "This can take a LONG time, please wait for the output..\n"
backup & backup &
sync & sync &
wait wait