quico-os-setup/arch-zbm
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

21-assist-in-env-setup #23

Merged
hygienic-books merged 17 commits from 21-assist-in-env-setup into main 2023-11-06 00:39:33 +00:00
Conversation 0 Commits 17 Files Changed 3 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28414af039 - Show all commits

4
setup.sh
View File

@ -19,9 +19,10 @@ exec 3>&1
declare this_script_url declare this_script_url
this_script_url="${SCRIPT_URL:?}" this_script_url="${SCRIPT_URL:?}"
declare zpool_name zfs_arch_dataset_name declare zpool_name zfs_arch_dataset_name settings_file
zpool_name='zpool' zpool_name='zpool'
zfs_arch_dataset_name='archlinux' zfs_arch_dataset_name='archlinux'
settings_file='archzbm_settings.env'
declare -A partition_types declare -A partition_types
partition_types[gpt_zfs]='6a85cf4d-1dd2-11b2-99a6-080020736631' partition_types[gpt_zfs]='6a85cf4d-1dd2-11b2-99a6-080020736631'
@ -330,7 +331,6 @@ function load_settings_file () {
#1.8 #1.8
local working_dir settings_file settings_abs local working_dir settings_file settings_abs
working_dir="$(pwd)" working_dir="$(pwd)"
settings_file='archzbm_settings.env'
settings_abs="${working_dir}"'/'"${settings_file}" settings_abs="${working_dir}"'/'"${settings_file}"
if [[ -r "${settings_abs}" ]]; then if [[ -r "${settings_abs}" ]]; then
set -a set -a