[update] : Wrote all default settings in a separate file.

diff --git a/build.sh b/build.sh
index 3745f11..3d2417c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -13,75 +13,20 @@
 
 set -e
 set -u
-script_path="$(readlink -f ${0%/*})"
 
-# alteriso settings
-#
-# Do not change this variable.
-# To change the settings permanently, edit the config file.
-
-arch=$(uname -m)
-
-os_name="Alter Linux"
-iso_name=alterlinux
-iso_label="ALTER_$(date +%Y%m)"
-iso_publisher='Fascode Network <https://fascode.net>'
-iso_application="${os_name} Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=alter
-work_dir=work
-out_dir=out
-gpg_key=
-
-# AlterLinux additional settings
-password='alter'
-boot_splash=false
-kernel='zen'
-theme_name="alter-logo"
-theme_pkg="plymouth-theme-alter-logo-git"
-sfs_comp="zstd"
-sfs_comp_opt=""
-bash_debug=false
-debug=false
-rebuild=false
-japanese=false
-channel_name='xfce'
-cleaning=false
-defaultusername='alter'
-customized_username=false
-username='alter'
-shmkalteriso="false"
-nocolor=false
-usershell="/bin/bash"
-noconfirm=false
-nodepend=false
-msgdebug=false
-rebuildfile="${work_dir}/build_options"
+# Internal config
+# Do not change these values.
+script_path="$(readlink -f ${0%/*})"
 defaultconfig="${script_path}/default.conf"
-dependence=(
-    "alterlinux-keyring"
-#   "archiso"
-    "arch-install-scripts"
-    "curl"
-    "dosfstools"
-    "edk2-shell"
-    "git"
-    "libburn"
-    "libisofs"
-    "lz4"
-    "lzo"
-    "make"
-    "squashfs-tools"
-    "libisoburn"
- #  "lynx"
-    "xz"
-    "zlib"
-    "zstd"
-)
 
 
 # Load config file
-[[ -f "${defaultconfig}" ]] && source "${defaultconfig}"
+if [[ -f "${defaultconfig}" ]]; then
+    source "${defaultconfig}"
+else
+    echo "${defaultconfig} was not found."
+    exit 1
+fi
 
 
 umask 0022
@@ -1372,6 +1317,9 @@ fi
 # Pacman configuration file used only when building
 build_pacman_conf=${script_path}/system/pacman-${arch}.conf
 
+# Set rebuild config file
+rebuildfile="${work_dir}/build_options"
+
 
 # Parse channels
 set +eu

diff --git a/default.conf b/default.conf
index 4bd0bd3..0dec0ea 100644 (file)
--- a/default.conf
+++ b/default.conf
@@ -12,6 +12,10 @@
 # This configuration file follows the bash syntax.
 #
 
+
+# Architecture to build
+arch=$(uname -m)
+
 # OS name used for startup screen, etc.
 os_name="Alter Linux"
 
@@ -90,6 +94,9 @@ password="alter"
 # Set the user's default shell.
 usershell="/bin/bash"
 
+# Channel name to build by default
+channel_name='xfce'
+
 # Set whether to check the build.
 # If true, do not check. If false, confirm.
 noconfirm=false
@@ -128,3 +135,4 @@ dependence=(
     "zlib"
     "zstd"
 )
+