ARGUMENT=("${@}")
alteriso_version="3.1"
norepopkg=()
+legacy_mode=false
+rerun=false
# Load config file
[[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
# Message common function
# msg_common [type] [-n] [string]
msg_common(){
- local _msg_opts=("-a" "build.sh") _type="${1}"
- shift 1
+ local _msg_opts=("-a" "build.sh") _type="${1}" && shift 1
[[ "${1}" = "-n" ]] && _msg_opts+=("-o" "-n") && shift 1
[[ "${msgdebug}" = true ]] && _msg_opts+=("-x")
[[ "${nocolor}" = true ]] && _msg_opts+=("-n")
echo " --nodebug Disable all debug messages"
echo " --noefi No efi boot (Use only for debugging)"
echo " --noloopmod No check and load kernel module automatically"
- echo " --nodepend No check package dependencies before building"
+ echo " --[no]depend (No) check package dependencies before building"
echo " --noiso No build iso image (Use with --tarball)"
echo " --nosigcheck No pacman signature check"
echo " --pacman-debug Enable pacman debug mode"
if [[ "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "${channel_name}")" = "3.0" ]]; then
msg_warn "The module cannot be used because it works with Alter ISO3.0 compatibility."
modules=("legacy")
+ legacy_mode=true
[[ "${include_extra-"unset"}" = true ]] && modules=("legacy-extra")
fi
if [[ ! "${logging}" = false ]]; then
[[ "${customized_logpath}" = false ]] && logging="${out_dir}/${iso_filename%.iso}.log"
mkdir -p "$(dirname "${logging}")" && touch "${logging}"
- msg_warn "Re-run sudo ${0} ${ARGUMENT[*]} --nodepend --nolog --nocolor 2>&1 | tee ${logging}"
- sudo "${0}" "${ARGUMENT[@]}" --nolog --nocolor --nodepend 2>&1 | tee "${logging}"
+ msg_warn "Re-run sudo ${0} ${ARGUMENT[*]} --nodepend --nolog --nocolor --rerun 2>&1 | tee ${logging}"
+ sudo "${0}" "${ARGUMENT[@]}" --nolog --nocolor --nodepend --rerun 2>&1 | tee "${logging}"
exit "${?}"
fi
readarray -t _pkglist_install < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
# Package check
- #readarray -t _pkglist < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
- #readarray -t repopkgs < <(pacman-conf -c "${build_pacman_conf}" -l | xargs -I{} pacman -Sql --config "${build_pacman_conf}" --color=never {} && pacman -Sg)
- #local _pkg
- #for _pkg in "${_pkglist[@]}"; do
- # msg_info "Checking ${_pkg}..."
- # if printf "%s\n" "${repopkgs[@]}" | grep -qx "${_pkg}"; then
- # _pkglist_install+=("${_pkg}")
- # else
- # msg_info "${_pkg} was not found. Install it with yay from AUR"
- # norepopkg+=("${_pkg}")
- # fi
- #done
+ if [[ "${legacy_mode}" = true ]]; then
+ readarray -t _pkglist < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
+ readarray -t repopkgs < <(pacman-conf -c "${build_pacman_conf}" -l | xargs -I{} pacman -Sql --config "${build_pacman_conf}" --color=never {} && pacman -Sg)
+ local _pkg
+ for _pkg in "${_pkglist[@]}"; do
+ msg_info "Checking ${_pkg}..."
+ if printf "%s\n" "${repopkgs[@]}" | grep -qx "${_pkg}"; then
+ _pkglist_install+=("${_pkg}")
+ else
+ msg_info "${_pkg} was not found. Install it with yay from AUR"
+ norepopkg+=("${_pkg}")
+ fi
+ done
+ fi
# Create a list of packages to be finally installed as packages.list directly under the working directory.
echo -e "# The list of packages that is installed in live cd.\n#\n" > "${build_dir}/packages.list"
cp "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
done
+ sed -i "s|%COWSPACE%|${cowspace}|g" "${airootfs_dir}/etc/initcpio/hooks/archiso"
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${airootfs_dir}/etc/initcpio/install/archiso_shutdown"
cp "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
- cp "${script_path}/system/initcpio/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
+ cp "${script_path}/system/initcpio/script/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
[[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
make_overisofs() {
local _over_isofs_list _isofs
_over_isofs_list=("${channel_dir}/over_isofs.any""${channel_dir}/over_isofs.${arch}")
- for_module '_over_isofs_list+=("${module_dir}/{}/over_isofs.any""${module_dir}/{}/over_isofs.${arch}")'
+ for_module '_over_isofs_list+=("${module_dir}/{}/over_isofs.any" "${module_dir}/{}/over_isofs.${arch}")'
for _isofs in "${_over_isofs_list[@]}"; do
- [[ -d "${_isofs}" ]] && cp -af "${_isofs}"/* "${isofs_dir}"
+ [[ -d "${_isofs}" ]] && [[ -n "$(find "${_isofs}" -mindepth 1 -maxdepth 2)" ]] && cp -af "${_isofs}"/* "${isofs_dir}"
done
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:" "nogitversion")
+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" "cowspace:" "rerun" "depend")
GETOPT=(-o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}")
getopt -Q "${GETOPT[@]}" || exit 1 # 引数エラー判定
readarray -t OPT < <(getopt "${GETOPT[@]}") # 配列に代入
--nochkver ) nochkver=true && shift 1 ;;
--noefi ) noefi=true && shift 1 ;;
--channellist ) show_channel_list && exit 0 ;;
- --config ) source "${2}" && shift 2 ;;
+ --config ) source "${2}" ; shift 2 ;;
--pacman-debug ) pacman_debug=true && shift 1 ;;
--nosigcheck ) nosigcheck=true && shift 1 ;;
--normwork ) normwork=true && shift 1 ;;
--nolog ) logging=false && shift 1 ;;
--nopkgbuild ) nopkgbuild=true && shift 1 ;;
--nogitversion ) gitversion=false && shift 1 ;;
+ --cowspace ) cowspace="${2}" && shift 2 ;;
+ --rerun ) rerun=true && shift 1 ;;
+ --depend ) nodepend=false && shift 1 ;;
-- ) shift 1 && break ;;
*)
msg_error "Argument exception error '${1}'"
if (( ! "${EUID}" == 0 )); then
msg_warn "This script must be run as root." >&2
msg_warn "Re-run 'sudo ${0} ${ARGUMENT[*]}'"
- sudo "${0}" "${ARGUMENT[@]}"
+ sudo "${0}" "${ARGUMENT[@]}" --rerun
exit "${?}"
fi
OSDN Git Service
