# Load config file
[[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
for config in "${defaultconfig}" "${script_path}/custom.conf"; do
- [[ -f "${config}" ]] && source "${config}"
+ [[ -f "${config}" ]] && source "${config}" && loaded_files+=("${config}")
done
umask 0022
echo " -x | --bash-debug Enable bash debug mode(set -xv)"
echo " --channellist Output the channel list and exit"
echo " --config Load additional config file"
- echo " --gitversion Add Git commit hash to image file version"
+ echo " --[no]gitversion Add Git commit hash to image file version"
echo " --logpath <file> Set log file path (use with --log)"
echo " --[no]log (No) log ;re-run script with tee"
echo " --msgdebug Enables output debugging"
# Helper function to run make_*() only one time.
run_once() {
if [[ ! -e "${lockfile_dir}/build.${1}" ]]; then
+ umount_work
msg_debug "Running ${1} ..."
mount_airootfs
eval "${@}"
mkdir -p "${lockfile_dir}"; touch "${lockfile_dir}/build.${1}"
- umount_work
+
else
msg_debug "Skipped because ${1} has already been executed."
fi
# コマンドをchrootで実行する
_chroot_run() {
msg_debug "Run command in chroot\nCommand: ${*}"
- eval -- arch-chroot "${airootfs_dir}" "${@}"
+ arch-chroot "${airootfs_dir}" "${@}" || return "${?}"
}
_cleanup_common () {
[[ "${customized_password}" = false ]] && password="${defaultpassword}"
# gitversion
+ [[ ! -d "${script_path}/.git" ]] && [[ "${gitversion}" = true ]] && msg_error "There is no git directory. You need to use git clone to use this feature." "1"
[[ "${gitversion}" = true ]] && iso_version="${iso_version}-${gitrev}"
# Generate tar file name
# Create script
for _script in "${_script_list[@]}"; do
if [[ -f "${_script}" ]]; then
- (echo && cat "${_script}") >> "${airootfs_dir}/${_main_script}"
+ (echo -e "\n#--$(basename "${_script}")--#\n" && cat "${_script}") >> "${airootfs_dir}/${_main_script}"
remove "${_script}"
else
msg_debug "${_script} was not found."
exec 17<>"${build_dir}/gpgkey"
fi
- _chroot_run "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/${kernel_filename} -g /boot/archiso.img"
+ _chroot_run mkinitcpio -c "/etc/mkinitcpio-archiso.conf" -k "/boot/${kernel_filename}" -g "/boot/archiso.img"
[[ "${gpg_key}" ]] && exec 17<&-
local _info_file="${isofs_dir}/alteriso-info" _version="${iso_version}"
remove "${_info_file}"; touch "${_info_file}"
[[ -d "${script_path}/.git" ]] && [[ "${gitversion}" = false ]] && _version="${iso_version}-${gitrev}"
- "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" > "${_info_file}"
+ "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" -m "$(printf "%s," "${modules[@]}")" > "${_info_file}"
fi
return 0
# Parse options
-ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}")
-OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x")
-OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:" "add-module:")
-OPT="$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}")" || exit 1
+ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}") OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x") OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:" "add-module:" "nogitversion")
+GETOPT=(-o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}")
+getopt -Q "${GETOPT[@]}" || exit 1 # 引数エラー判定
+readarray -t OPT < <(getopt "${GETOPT[@]}") # 配列に代入
-eval set -- "${OPT}"
-msg_debug "Argument: ${OPT}"
-unset OPT OPTS OPTL DEFAULT_ARGUMENT
+eval set -- "${OPT[@]}"
+msg_debug "Argument: ${OPT[*]}"
+unset OPT OPTS OPTL DEFAULT_ARGUMENT GETOPT
while true; do
case "${1}" in
- -a | --arch)
- arch="${2}"
- shift 2
- ;;
- -b | --boot-splash)
- boot_splash=true
- shift 1
- ;;
-c | --comp-type)
case "${2}" in
"gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") sfs_comp="${2}" ;;
esac
shift 2
;;
- -d | --debug)
- debug=true
- shift 1
- ;;
- -e | --cleaning | --cleanup)
- cleaning=true
- shift 1
- ;;
- -g | --gpgkey)
- gpg_key="${2}"
- shift 2
- ;;
- -h | --help)
- _usage 0
- ;;
-j | --japanese)
msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
;;
kernel="${2}"
shift 2
;;
- -l | --lang)
- locale_name="${2}"
- shift 2
- ;;
- -o | --out)
- out_dir="${2}"
- shift 2
- ;;
-p | --password)
customized_password=true
password="${2}"
shift 2
;;
- -r | --tarball)
- tarball=true
- shift 1
- ;;
-t | --comp-opts)
if [[ "${2}" = "reset" ]]; then
sfs_comp_opt=()
username="$(echo -n "${2}" | sed 's/ //g' | tr '[:upper:]' '[:lower:]')"
shift 2
;;
- -w | --work)
- work_dir="${2}"
- shift 2
- ;;
- -x | --bash-debug)
- debug=true
- bash_debug=true
- shift 1
- ;;
- --noconfirm)
- noconfirm=true
- shift 1
- ;;
- --confirm)
- noconfirm=false
- shift 1
- ;;
- --nodepend)
- nodepend=true
- shift 1
- ;;
- --nocolor)
- nocolor=true
- shift 1
- ;;
- --gitversion)
- if [[ -d "${script_path}/.git" ]]; then
- gitversion=true
- else
- msg_error "There is no git directory. You need to use git clone to use this feature." "1"
- fi
- shift 1
- ;;
- --msgdebug)
- msgdebug=true;
- shift 1
- ;;
- --noloopmod)
- noloopmod=true
- shift 1
- ;;
- --noiso)
- noiso=true
- shift 1
- ;;
- --noaur)
- noaur=true
- shift 1
- ;;
- --nochkver)
- nochkver=true
- shift 1
- ;;
--nodebug)
debug=false
msgdebug=false
bash_debug=false
shift 1
;;
- --noefi)
- noefi=true
- shift 1
- ;;
- --channellist)
- show_channel_list
- exit 0
- ;;
- --config)
- source "${2}"
- shift 2
- ;;
- --pacman-debug)
- pacman_debug=true
- shift 1
- ;;
- --nosigcheck)
- nosigcheck=true
- shift 1
- ;;
- --normwork)
- normwork=true
- shift 1
- ;;
- --log)
- logging=true
- shift 1
- ;;
--logpath)
logging="${2}"
customized_logpath=true
shift 2
;;
- --nolog)
- logging=false
- shift 1
- ;;
- --nopkgbuild)
- nopkgbuild=true
- shift 1
- ;;
--tar-type)
case "${2}" in
"gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") tar_comp="${2}" ;;
msg_debug "Added modules: ${additional_modules[*]}"
shift 2
;;
- --)
- shift
- break
- ;;
+ -g | --gpgkey ) gpg_key="${2}" && shift 2 ;;
+ -h | --help ) _usage 0 ;;
+ -a | --arch ) arch="${2}" && shift 2 ;;
+ -d | --debug ) debug=true && shift 1 ;;
+ -e | --cleaning | --cleanup ) cleaning=true && shift 1 ;;
+ -b | --boot-splash ) boot_splash=true && shift 1 ;;
+ -l | --lang ) locale_name="${2}" && shift 2 ;;
+ -o | --out ) out_dir="${2}" && shift 2 ;;
+ -r | --tarball ) tarball=true && shift 1 ;;
+ -w | --work ) work_dir="${2}" && shift 2 ;;
+ -x | --bash-debug ) bash_debug=true && shift 1 ;;
+ --gitversion ) gitversion=true && shift 1 ;;
+ --noconfirm ) noconfirm=true && shift 1 ;;
+ --confirm ) noconfirm=false && shift 1 ;;
+ --nodepend ) nodepend=true && shift 1 ;;
+ --nocolor ) nocolor=true && shift 1 ;;
+ --msgdebug ) msgdebug=true && shift 1 ;;
+ --noloopmod ) noloopmod=true && shift 1 ;;
+ --noiso ) noiso=true && shift 1 ;;
+ --noaur ) noaur=true && shift 1 ;;
+ --nochkver ) nochkver=true && shift 1 ;;
+ --noefi ) noefi=true && shift 1 ;;
+ --channellist ) show_channel_list && exit 0 ;;
+ --config ) source "${2}" && shift 2 ;;
+ --pacman-debug ) pacman_debug=true && shift 1 ;;
+ --nosigcheck ) nosigcheck=true && shift 1 ;;
+ --normwork ) normwork=true && shift 1 ;;
+ --log ) logging=true && shift 1 ;;
+ --nolog ) logging=false && shift 1 ;;
+ --nopkgbuild ) nopkgbuild=true && shift 1 ;;
+ --nogitversion ) gitversion=false && shift 1 ;;
+ -- ) shift 1 && break ;;
*)
msg_error "Argument exception error '${1}'"
msg_error "Please report this error to the developer." 1
eval "${_dir}=\"$(realpath "$(eval "echo \$${_dir}")")\""
done
-
# Set for special channels
if [[ -d "${channel_dir}.add" ]]; then
channel_name="${1}"
fi
fi
-set -eu
-
prepare_env
prepare_build
show_settings
OSDN Git Service
