diff --git a/functions/backup.sh b/functions/backup.sh index 58fa1904..1226c9d3 100644 --- a/functions/backup.sh +++ b/functions/backup.sh @@ -2,7 +2,7 @@ backup(){ -echo_backup+=("\nšŸ„± šŸ„° šŸ„² šŸ„ŗ šŸ…„ šŸ„æ šŸ…‚") +echo_backup+=("šŸ„± šŸ„° šŸ„² šŸ„ŗ šŸ…„ šŸ„æ šŸ…‚") echo_backup+=("Number of backups was set to $number_of_backups") date=$(date '+%Y_%m_%d_%H_%M_%S') [[ "$verbose" == "true" ]] && cli -c 'app kubernetes backup_chart_releases backup_name=''"'HeavyScript_"$date"'"' &> /dev/null && echo_backup+=(HeavyScript_"$date") @@ -24,6 +24,8 @@ for i in "${echo_backup[@]}" do echo -e "$i" done +echo +echo } export -f backup diff --git a/functions/misc.sh b/functions/misc.sh index 880de232..54eaefa1 100644 --- a/functions/misc.sh +++ b/functions/misc.sh @@ -2,7 +2,7 @@ sync(){ -echo_sync+=("\n\nšŸ…‚ šŸ…ˆ šŸ„½ šŸ„²") +echo_sync+=("šŸ…‚ šŸ…ˆ šŸ„½ šŸ„²") 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. @@ -10,6 +10,8 @@ for i in "${echo_sync[@]}" do echo -e "$i" done +echo +echo } export -f sync diff --git a/functions/self_update.sh b/functions/self_update.sh index 2e99e7bc..98a3e19e 100644 --- a/functions/self_update.sh +++ b/functions/self_update.sh @@ -15,14 +15,14 @@ if git diff --name-only origin/main | grep -qs ".sh" ; then [[ "$i" == "--self-update" ]] && unset "args[$count]" && break ((count++)) done - [[ -z ${args[*]} ]] && echo -e "No more arguments, exiting..\n" && exit - echo -e "Running the new version...\n" + [[ -z ${args[*]} ]] && echo -e "No more arguments, exiting..\n\n" && exit + echo -e "Running the new version...\n\n" sleep 5 exec bash "$script_name" "${args[@]}" # Now exit this old instance exit else - echo -e "HeavyScript is already the latest version\n" + echo -e "HeavyScript is already the latest version\n\n" fi } export -f self_update diff --git a/heavy_script.sh b/heavy_script.sh index db7068c2..c5e387c4 100644 --- a/heavy_script.sh +++ b/heavy_script.sh @@ -148,7 +148,7 @@ done if [[ "$backup" == "true" && "$sync" == "true" ]]; then # Run backup and sync at the same time echo "šŸ…ƒ šŸ„° šŸ…‚ šŸ„ŗ šŸ…‚ :" echo -e "-Backing up ix-applications dataset\n-Syncing catalog(s)" - echo -e "This can take a LONG time, please wait for both output..\n" + echo -e "This can take a LONG time, please wait for both output..\n\n" backup & sync & wait