diff --git a/install.sh b/install.sh index 62dccc33c..a3436eeb0 100755 --- a/install.sh +++ b/install.sh @@ -1,24 +1,24 @@ #!/usr/bin/env bash cd "$(dirname "$0")" export base="$(pwd)" -source ./scriptdata/environment-variables -source ./scriptdata/functions -source ./scriptdata/installers -source ./scriptdata/options +source ./scriptdata/environment-variables.sh +source ./scriptdata/functions.sh +source ./scriptdata/installers.sh +source ./scriptdata/options.sh prevent_sudo_or_root set -e ##################################################################################### # 0. Before we start -source ./scriptdata/install-greeting +source ./scriptdata/install-greeting.sh ##################################################################################### printf "${COLOR_CYAN}[$0]: 1. Install dependencies\n${COLOR_RESET}" # TODO: if `--via-nix` is specified, source `install-deps-nix` instead. -source ./scriptdata/install-deps-arch +source ./scriptdata/install-deps-arch.sh ##################################################################################### printf "${COLOR_CYAN}[$0]: 2. Setup for user groups/services etc\n${COLOR_RESET}" -source ./scriptdata/install-setups +source ./scriptdata/install-setups.sh ##################################################################################### printf "${COLOR_CYAN}[$0]: 3. Copying + Configuring\n${COLOR_RESET}" -source ./scriptdata/install-files +source ./scriptdata/install-files.sh diff --git a/manual-install-helper.sh b/manual-install-helper.sh index 7f92a7aae..7ea34ebee 100755 --- a/manual-install-helper.sh +++ b/manual-install-helper.sh @@ -5,9 +5,9 @@ cd "$(dirname "$0")" export base="$(pwd)" -source ./scriptdata/environment-variables -source ./scriptdata/functions -source ./scriptdata/installers +source ./scriptdata/environment-variables.sh +source ./scriptdata/functions.sh +source ./scriptdata/installers.sh prevent_sudo_or_root if command -v pacman >/dev/null 2>&1;then printf "${COLOR_RED}[$0]: pacman found, it seems that the system is ArchLinux or Arch-based distro. Aborting...${COLOR_RESET}\n";exit 1;fi diff --git a/scriptdata/environment-variables b/scriptdata/environment-variables.sh similarity index 100% rename from scriptdata/environment-variables rename to scriptdata/environment-variables.sh diff --git a/scriptdata/functions b/scriptdata/functions.sh similarity index 100% rename from scriptdata/functions rename to scriptdata/functions.sh diff --git a/scriptdata/install-deps-arch b/scriptdata/install-deps-arch.sh similarity index 100% rename from scriptdata/install-deps-arch rename to scriptdata/install-deps-arch.sh diff --git a/scriptdata/install-files b/scriptdata/install-files.sh similarity index 100% rename from scriptdata/install-files rename to scriptdata/install-files.sh diff --git a/scriptdata/install-greeting b/scriptdata/install-greeting.sh similarity index 100% rename from scriptdata/install-greeting rename to scriptdata/install-greeting.sh diff --git a/scriptdata/install-setups b/scriptdata/install-setups.sh similarity index 100% rename from scriptdata/install-setups rename to scriptdata/install-setups.sh diff --git a/scriptdata/installers b/scriptdata/installers.sh similarity index 98% rename from scriptdata/installers rename to scriptdata/installers.sh index 4cf45f3a9..52b74173a 100644 --- a/scriptdata/installers +++ b/scriptdata/installers.sh @@ -1,9 +1,9 @@ -# This file is provided for any distros, mainly non-Arch(based) distros. - -# This script depends on `functions' . +# This script depends on `functions.sh' . # This is NOT a script for execution, but for loading functions, so NOT need execution permission or shebang. # NOTE that you NOT need to `cd ..' because the `$0' is NOT this file, but the script file which will source this file. +# This file is provided for any distros, mainly non-Arch(based) distros. + # The script that use this file should have two lines on its top as follows: # cd "$(dirname "$0")" # export base="$(pwd)" diff --git a/scriptdata/options b/scriptdata/options.sh similarity index 100% rename from scriptdata/options rename to scriptdata/options.sh diff --git a/uninstall.sh b/uninstall.sh index b48cc79db..c72bf5f17 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash cd "$(dirname "$0")" -source ./scriptdata/environment-variables -source ./scriptdata/functions +source ./scriptdata/environment-variables.sh +source ./scriptdata/functions.sh prevent_sudo_or_root function v() {