Linux - run_all.sh: Fix orderings

jan-revay · Dec 26, 2024 · 128a122 · 128a122
1 parent 112d1d7
commit 128a122
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/DebianCLI/run_all.sh b/DebianCLI/run_all.sh
@@ -7,12 +7,10 @@ distro_is debian
 distro_version_ge 12
 gnome_present no
 
-# Run stuff that requires user input first (if not turned off by `--noninteractive`)
-. ../UbuntuCLI/interactive_part.sh
-
 # Let's try to keep the Ubuntu install script Debian compatible
-
 . ../UbuntuCLI/packages_install.sh
-. ../UbuntuCLI/configs_install.sh
+. ../UbubtuCLI/packages_install_optional.sh
 . debian_specific_packages.sh # last, because some packages are built from source
-# . ../UbubtuCLI/packages_install_optional.sh
+# stuff that requires user input can be turned off by `--noninteractive` CLI param
+. ../UbuntuCLI/interactive_part.sh
+. ../UbuntuCLI/configs_install.sh
diff --git a/KaliCLI/run_all.sh b/KaliCLI/run_all.sh
@@ -7,11 +7,11 @@ distro_is kali
 distro_version_ge 2023
 gnome_present no
 
-# Run stuff that requires user input first (if not turned off by `--noninteractive`)
-. ../UbuntuCLI/interactive_part.sh
 # Let's try to keep the Ubuntu install script Kali compatible
 . ../UbuntuCLI/packages_install.sh
-. ../UbuntuCLI/configs_install.sh
 # TODO create kali_specific_packages.sh
+. ../UbuntuCLI/optional_packages_install.sh
 . ../DebianCLI/debian_specific_packages.sh # last, because some packages are built from source
-# . ../UbuntuCLI/packages_install_optional.sh
+# stuff that requires user input can be turned off by `--noninteractive` CLI param
+. ../UbuntuCLI/interactive_part.sh
+. ../UbuntuCLI/configs_install.sh
diff --git a/UbuntuCLI/run_all.sh b/UbuntuCLI/run_all.sh
@@ -9,7 +9,8 @@ gnome_present no
 
 . ubuntu_specific_packages.sh
 . packages_install.sh
+. ubuntu_specific_packages.sh
+. optional_packages_install.sh
 # stuff that requires user input can be turned off by `--noninteractive` CLI param
 . interactive_part.sh
-. optional_packages_install.sh
 . configs_install.sh
diff --git a/Ubuntu_22.04/run_all.sh b/Ubuntu_22.04/run_all.sh
@@ -16,6 +16,7 @@ export NEEDRESTART_SUSPEND=1
 # Run stuff that requires user input first (if not turned off by `--noninteractive`)
 . packages_install.sh
 . ../UbuntuCLI/ubuntu_specific_packages.sh
+. ../UbuntuCLI/optional_packages_install.sh
 . interactive_part.sh
 . configs_install.sh