diff --git a/global_vars.sh b/global_vars.sh deleted file mode 100644 index 470c4e1..0000000 --- a/global_vars.sh +++ /dev/null @@ -1,22 +0,0 @@ -# shellcheck disable=SC2148 -# shellcheck disable=SC2155 -# shellcheck disable=SC2034 - -#======================================= -# HEADERS -#======================================= - -#--------------------------------------- -# GLOBAL VARS -#--------------------------------------- - -packages=() -aptGetWasUpdated=0 -freshInstall=0 -cachedMenuDomain='' -lastTimeSpaceInfo=0 -diagnosticsSizeOk=0 -forceUpdateCheck=0 - -MIKRUS_APIKEY='' -MIKRUS_HOST='' diff --git a/src/app_cleanup.sh b/src/app_cleanup.sh index c101135..aa32dba 100644 --- a/src/app_cleanup.sh +++ b/src/app_cleanup.sh @@ -1,7 +1,7 @@ # shellcheck disable=SC2148 # shellcheck disable=SC2155 -#dev-begin: +#dev-begin #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # IMPORTS #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/app_config.sh b/src/app_config.sh index 8727b07..3e532fa 100644 --- a/src/app_config.sh +++ b/src/app_config.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # CONFIG AND MANAGEMENT UI #======================================= diff --git a/src/app_diagnostics.sh b/src/app_diagnostics.sh index 89cfd6f..cfa2639 100644 --- a/src/app_diagnostics.sh +++ b/src/app_diagnostics.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # DIAGNOSTICS UI #======================================= diff --git a/src/app_main.sh b/src/app_main.sh index 6d44398..f3424fa 100644 --- a/src/app_main.sh +++ b/src/app_main.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # MAIN APP UI #======================================= diff --git a/src/app_other_dialogs.sh b/src/app_other_dialogs.sh index c127c66..d60bc4f 100644 --- a/src/app_other_dialogs.sh +++ b/src/app_other_dialogs.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # OTHER UI #======================================= diff --git a/src/app_setup.sh b/src/app_setup.sh index 71ddb0c..cd900b6 100644 --- a/src/app_setup.sh +++ b/src/app_setup.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SETUP UI #======================================= diff --git a/src/app_setup_prompts.sh b/src/app_setup_prompts.sh index f5e7347..c530b6f 100644 --- a/src/app_setup_prompts.sh +++ b/src/app_setup_prompts.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SETUP PROMPT DIALOGS #======================================= diff --git a/src/app_update.sh b/src/app_update.sh index bb1a05b..633a95e 100644 --- a/src/app_update.sh +++ b/src/app_update.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # UPDATE UI #======================================= diff --git a/src/app_watchdog.sh b/src/app_watchdog.sh index b8e157a..b1707bd 100644 --- a/src/app_watchdog.sh +++ b/src/app_watchdog.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # WATCHDOG UI #======================================= diff --git a/src/commandline.sh b/src/commandline.sh index 4ad7e48..5fe1f1e 100644 --- a/src/commandline.sh +++ b/src/commandline.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # COMMANDLINE PARSER #======================================= diff --git a/src/headers.sh b/src/headers.sh new file mode 100644 index 0000000..9bb2d76 --- /dev/null +++ b/src/headers.sh @@ -0,0 +1,31 @@ +#dev-begin +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 +# shellcheck disable=SC2034 + +if [ "EXECUTED" != "true" ]; then + + msgerr "Headers USED!" + #======================================= + # HEADERS + #======================================= + + #--------------------------------------- + # GLOBAL VARS + #--------------------------------------- + + packages=() + aptGetWasUpdated=0 + freshInstall=0 + cachedMenuDomain='' + lastTimeSpaceInfo=0 + diagnosticsSizeOk=0 + forceUpdateCheck=0 + + MIKRUS_APIKEY='' + MIKRUS_HOST='' + +else + msgdebug "Headers ignored" +fi +#dev-end diff --git a/src/lib.sh b/src/lib.sh index f936dd4..7b278e1 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -43,6 +43,7 @@ SCRIPT_VERSION="1.10.1" #auto-update SCRIPT_BUILD_TIME="2026.01.05" #auto-update FORCE_DEBUG_LOG="" NONINTERACTIVE_MODE="false" +EXECUTED="true" #======================================= # DOWNLOAD CONFIG diff --git a/src/logic_app.sh b/src/logic_app.sh index 7c541d5..4e33e6c 100644 --- a/src/logic_app.sh +++ b/src/logic_app.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # APP LOGIC #======================================= diff --git a/src/logic_cleanup.sh b/src/logic_cleanup.sh index fcba3d8..bd32850 100644 --- a/src/logic_cleanup.sh +++ b/src/logic_cleanup.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # CLEANUP LOGIC #======================================= diff --git a/src/logic_config.sh b/src/logic_config.sh index 58725bb..b0ef9da 100644 --- a/src/logic_config.sh +++ b/src/logic_config.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # CONFIGURATION #======================================= diff --git a/src/logic_diagnostics.sh b/src/logic_diagnostics.sh index 4e585bb..1b33712 100644 --- a/src/logic_diagnostics.sh +++ b/src/logic_diagnostics.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # DIAGNOSTICS #======================================= diff --git a/src/logic_docker.sh b/src/logic_docker.sh index 9079a05..e6fe9c5 100644 --- a/src/logic_docker.sh +++ b/src/logic_docker.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # DOCKER #======================================= diff --git a/src/logic_events.sh b/src/logic_events.sh index 58be68c..832fdd1 100644 --- a/src/logic_events.sh +++ b/src/logic_events.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # EVENTS MARKERS LOGIC #======================================= diff --git a/src/logic_patch.sh b/src/logic_patch.sh index c6f16c8..1b8928e 100644 --- a/src/logic_patch.sh +++ b/src/logic_patch.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # PATCH OLDER CONFIGS #======================================= diff --git a/src/logic_setup.sh b/src/logic_setup.sh index f86bc31..ffd501f 100644 --- a/src/logic_setup.sh +++ b/src/logic_setup.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SETUP #======================================= diff --git a/src/logic_setup_checks.sh b/src/logic_setup_checks.sh index bd529a4..1d0f7c0 100644 --- a/src/logic_setup_checks.sh +++ b/src/logic_setup_checks.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SETUP CHECKS #======================================= diff --git a/src/logic_update.sh b/src/logic_update.sh index 8081561..9ae00e6 100644 --- a/src/logic_update.sh +++ b/src/logic_update.sh @@ -1,6 +1,14 @@ # shellcheck disable=SC2148 # shellcheck disable=SC2155 +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # UPGRADE #======================================= diff --git a/src/logic_watchdog.sh b/src/logic_watchdog.sh index d4eddab..8e05c56 100644 --- a/src/logic_watchdog.sh +++ b/src/logic_watchdog.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # WATCHDOG LOGIC #======================================= diff --git a/src/screen_config.sh b/src/screen_config.sh index f6de931..e372d06 100644 --- a/src/screen_config.sh +++ b/src/screen_config.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SETUP #======================================= diff --git a/src/screen_dialogs.sh b/src/screen_dialogs.sh index fb6ac0c..03e12ad 100644 --- a/src/screen_dialogs.sh +++ b/src/screen_dialogs.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # SCREEN DIALOGS #======================================= diff --git a/src/screen_formaters.sh b/src/screen_formaters.sh index 7c69dbc..59ab7d2 100644 --- a/src/screen_formaters.sh +++ b/src/screen_formaters.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # FORMATERS #======================================= diff --git a/src/utils.sh b/src/utils.sh index c1b7118..3a15bb7 100644 --- a/src/utils.sh +++ b/src/utils.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # UTILS #======================================= diff --git a/src/utils_app.sh b/src/utils_app.sh index a62b10f..0361a71 100644 --- a/src/utils_app.sh +++ b/src/utils_app.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # APP #======================================= diff --git a/src/utils_console.sh b/src/utils_console.sh index 291c2fd..eca2fb9 100644 --- a/src/utils_console.sh +++ b/src/utils_console.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # CONSOLE OUTPUT UTILS #======================================= diff --git a/src/utils_reminders.sh b/src/utils_reminders.sh index 3358549..4d4ecb3 100644 --- a/src/utils_reminders.sh +++ b/src/utils_reminders.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # REMINDERS #======================================= diff --git a/src/utils_string.sh b/src/utils_string.sh index 3e8f68a..c2447c8 100644 --- a/src/utils_string.sh +++ b/src/utils_string.sh @@ -1,3 +1,14 @@ +# shellcheck disable=SC2148 +# shellcheck disable=SC2155 + +#dev-begin +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# IMPORTS +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# shellcheck source=./headers.sh +source ./headers.sh +#dev-end + #======================================= # STRING UTILS #=======================================