Formatting: move . prelude.sh to the first line everywhere

jan-revay · jan-revay · commit 52b486ac35ad · 2025-11-26T10:52:38.000+01:00
diff --git a/Android_13/10packages.sh b/Android_13/10packages.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# BASE IMAGE Android 13
-
 . ../prelude.sh
+# BASE IMAGE Android 13
 
 # TODO add toybox https://android.googlesource.com/platform/external/toybox/+/b20c80b/README
 
diff --git a/Android_13/20configs.sh b/Android_13/20configs.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# BASE IMAGE: Android 13
-
 . ../prelude.sh
+# BASE IMAGE: Android 13
 
 if [ ! -d ~/storage ]; then
     termux-setup-storage
diff --git a/Android_13/run_all.sh b/Android_13/run_all.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# BASE IMAGE: Android 13
-
 . ../prelude.sh
+# BASE IMAGE: Android 13
 
 if uname -a | grep Android; then
     # TODO Move the if to a separate script file
diff --git a/CLI_Ubuntu/10interactive.sh b/CLI_Ubuntu/10interactive.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
+. ../prelude.sh
 # Stuff that requires user interaction and cannot be done by a script yet.
 # This script is being run first i.e. before anything else, so that all
 # user interaction is finished as quickly as possible.
 
-. ../prelude.sh
-
 function interactive_part
 {
     if ! gh auth status; then
diff --git a/CLI_Ubuntu/20packages.sh b/CLI_Ubuntu/20packages.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
+. ../prelude.sh
 # The script should not require any user input and should be idempotent.
 # TODO apt-get install linux-headers-$(uname -r) does not work in WSL
 # TODO move the package lists to external files
 # TODO add repos and packates that PopOS has: https://pop.system76.com/
-. ../prelude.sh
 
 export DEBIAN_FRONTEND=noninteractive
 # TODO "Which services should be restarted?" prompt is still present in VM
diff --git a/CLI_Ubuntu/30source_packages.sh b/CLI_Ubuntu/30source_packages.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
+. ../prelude.sh
 # The script should not require any user input and should be idempotent.
 # TODO apt-get install linux-headers-$(uname -r) does not work in WSL
 # TODO move the package lists to external files
 # TODO add repos and packates that PopOS has: https://pop.system76.com/
-. ../prelude.sh
 
 mkdir -p ~/localSW
 pushd ~/localSW/
diff --git a/CLI_Ubuntu/40configs.sh b/CLI_Ubuntu/40configs.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# The script should not require any user input and should be idempotent.
-
 . ../prelude.sh
+# The script should not require any user input and should be idempotent.
 
 # ==== Misc ====
 sudo update-alternatives --set editor /usr/bin/nvim
diff --git a/CLI_Ubuntu/run_all.sh b/CLI_Ubuntu/run_all.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# This script should be idempotent.
-
 . ../prelude.sh
+# This script should be idempotent.
 
 if distro_is ubuntu && distro_version_ge 24; then
     # stuff that requires user input can be turned off by `--noninteractive` CLI param
diff --git a/DistroAgnostic/10dotfiles.sh b/DistroAgnostic/10dotfiles.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. ../prelude.sh
 # The script should not require any user input and should be idempotent.
 # BASE IMAGE: ALL
 # Dotfiles are managed via bare git repository.
@@ -7,8 +8,6 @@
 # TODO simplify
 # TODO automatically set upstream branch (git push --set-upstream origin devel)
 
-. ../prelude.sh
-
 function dot
 {
     git --git-dir="${HOME}/.dotfiles/" --work-tree="${HOME}" "$@"
diff --git a/DistroAgnostic/20git_config.sh b/DistroAgnostic/20git_config.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 . ../prelude.sh
 
 git config --global core.editor "nvim"
diff --git a/DistroAgnostic/30git_hooks.sh b/DistroAgnostic/30git_hooks.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
+. ../prelude.sh
 # WARNING: this scripts expects ./DistroAgnostic as a working directory
 
 # TODO rename to snake case shared_configs_install.sh
 # TODO cd working directory to ./DistroAgnostic in this script
 # see: https://stackoverflow.com/questions/59895/how-do-i-get-the-directory-where-a-bash-script-is-located-from-within-the-script
 
-. ../prelude.sh
-
 # ==== Enable git hooks ====
 
 pushd ../.git/hooks/ || exit "${EXIT_FILE_IO_ERROR}"
diff --git a/DistroAgnostic/40mkdirs.sh b/DistroAgnostic/40mkdirs.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# The script should not require any user input and should be idempotent.
-
 . ../prelude.sh
+# The script should not require any user input and should be idempotent.
 
 mkdir -p ~/books
 mkdir -p ~/x     # all my development repos go here
diff --git a/DistroAgnostic/gnome/10flatpaks_snaps_appimages_nix.sh b/DistroAgnostic/gnome/10flatpaks_snaps_appimages_nix.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 . ../../prelude.sh
 
 # TODO setup automatic flatpak and snap updates
diff --git a/DistroAgnostic/gnome/20gnome_install_extensions.sh b/DistroAgnostic/gnome/20gnome_install_extensions.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
+. ../../prelude.sh
 # This script should be idempotent.
 # This script REQUIRES USER INTERACTION IN GNOME!!!
 #
 # TODO add extension settings
 # Consider this: https://github.com/PeterMosmans/ansible-role-customize-gnome
 
-. ../../prelude.sh
-
 # TODO compile schemas into a single file and provide that file
 # as schemadir voa exported variable in the extensions config script.
 # (chatgpt) also male research why do I need to specofy the schemadir
diff --git a/DistroAgnostic/gnome/40extensions_gsettings.sh b/DistroAgnostic/gnome/40extensions_gsettings.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 . ../../prelude.sh
 
 readonly SCHDIR="${HOME}/.local/share/gnome-shell/extensions/compiled_schemas"
diff --git a/DistroAgnostic/run_all.sh b/DistroAgnostic/run_all.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# This script should be idempotent.
-
 . ../prelude.sh
+# This script should be idempotent.
 
 # Run stuff that requires user input last (if not turned off by `--noninteractive`)
 for script in [0-9][0-9]*.sh; do
diff --git a/PopOS_22.04_deprecated/configs_install.sh.deprecated b/PopOS_22.04_deprecated/configs_install.sh.deprecated
@@ -1,12 +1,11 @@
 #!/bin/bash
+. ../prelude.sh
 # shellcheck disable=SC2317
 # WARNING: this script is not uptodate and also does not work - has a lot of bugs
 # it is more of an WIP record of TODOs and stubs than something usable
 echo Read the warning in the script
 exit 77
 
-. ../prelude.sh
-
 # TODO
 # in settings
 #    - desktop icons large
diff --git a/PopOS_22.04_deprecated/packages_install.sh.deprecated b/PopOS_22.04_deprecated/packages_install.sh.deprecated
diff --git a/PopOS_22.04_deprecated/run_all.sh.deprecated b/PopOS_22.04_deprecated/run_all.sh.deprecated
@@ -1,11 +1,10 @@
 #!/bin/bash
+. ../prelude.sh
 # This script should be idempotent.
 # shellcheck disable=SC2317  # Don't warn about unreachable commands in this file
 
 exit 1 # THIS script needs to be updated...
 
-. ../prelude.sh
-
 distro_is pop
 distro_version_ge 22
 gnome_present yes
diff --git a/StaticAnalysis/prelude_rearange.sh b/StaticAnalysis/prelude_rearange.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+# Find all .sh files and process each one
+find . -type f -name "*.sh" | while IFS= read -r file; do
+    # Check if file contains "prelude.sh"
+    if grep -qE "^\.[[:space:]]+(\.\./)*prelude\.sh$" "$file"; then
+        echo "Processing: $file"
+
+        # Extract the prelude line (first occurrence only)
+        prelude=$(grep -E -m1 "^\.[[:space:]]+(\.\./)*prelude\.sh$" "$file")
+
+        # Remove all lines containing "prelude.sh"
+        grep -vE "^\.[[:space:]]+(\.\./)*prelude\.sh$" "$file" > "$file.tmp"
+
+        # Copy permissions from original file to temp file
+        chmod --reference="$file" "$file.tmp"
+
+        # Insert prelude line after line 1 (making it line 2)
+        sed -i "1a\\
+$prelude" "$file.tmp"
+
+        # Replace original file
+        mv "$file.tmp" "$file"
+    fi
+done
+
+echo "Done!"
diff --git a/Ubuntu/10packages.sh b/Ubuntu/10packages.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. ../prelude.sh
 # The script should not require any user input and should be idempotent.
 
 # TODO use lists for packages (and use on install command)
@@ -8,8 +9,6 @@
 # TODO consider adding pavucontrol
 # TODO add nix package manager + start managing more packages via nix
 
-. ../prelude.sh
-
 export DEBIAN_FRONTEND=noninteractive
 # TODO "Which services should be restarted?" prompt is still present in VM
 export NEEDRESTART_MODE=a
diff --git a/Ubuntu/run_all.sh b/Ubuntu/run_all.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# This script should be idempotent.
-
 . ../prelude.sh
+# This script should be idempotent.
 
 if distro_is ubuntu && distro_version_ge 24 && gnome_present yes; then
     # TODO "Which services should be restarted?" prompt is still present in VM
diff --git a/pre-commit-hook.sh b/pre-commit-hook.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# TODO precommit hooks WIP
-
 . prelude.sh
+# TODO precommit hooks WIP
 
 # TODO always run from repo root directory regardless of the pwd
 
diff --git a/run_init.sh b/run_init.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-# Automatically detect and init/configure the host platform.
-
 . prelude.sh
+# Automatically detect and init/configure the host platform.
 
 if [[ $# == 0 ]]; then
     echo "No parameters set, the interactive part of the script will be executed..."

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-`
`3`	`2`	`. ../prelude.sh`
`4`	`3`
`5`	`4`	`git config --global core.editor "nvim"`