GitHubのミラーです
https://github.com/FascodeNet/alterlinux
Revisão | f37951b847943abe95296db17d8d10270b005c2f (tree) |
---|---|
Hora | 2021-08-19 00:44:54 |
Autor | hayao <hayao@fasc...> |
Commiter | hayao |
Merge branch 'dev' into dev-stable
@@ -2,26 +2,43 @@ | ||
2 | 2 | ARGS := |
3 | 3 | BUILD_SCRIPT := build.sh |
4 | 4 | KERNEL := zen |
5 | -SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm | |
5 | +SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --noconfirm | |
6 | 6 | ARCH_x86_64 := --arch x86_64 |
7 | 7 | ARCH_i686 := --arch i686 |
8 | 8 | FULLBUILD := -d -g -e --noconfirm |
9 | +DEBUG_OPTION := --debug --log | |
10 | +DEBUG := false | |
9 | 11 | FULL_x86_64 := xfce cinnamon i3 plasma gnome |
10 | 12 | FULL_i686 := xfce lxde |
11 | 13 | CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))} |
12 | 14 | |
15 | +ifeq (${DEBUG},true) | |
16 | + ARGS += ${ARGS} ${DEBUG_OPTION} | |
17 | +endif | |
18 | + | |
13 | 19 | full: |
14 | 20 | sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64} |
15 | 21 | sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686 ${FULL_i686} |
16 | 22 | @make clean |
17 | 23 | |
18 | -basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64: | |
24 | +basic-ja-64 basic-en-64 basic-ja-32 basic-en-32 \ | |
25 | +cinnamon-ja-64 cinnamon-en-64 cinnamon-ja-32 cinnamon-en-32 \ | |
26 | +gnome-ja-64 gnome-en-64 gnome-ja-32 gnome-en-32 \ | |
27 | +i3-ja-64 i3-en-64 i3-ja-32 i3-en-32 \ | |
28 | +lxde-ja-64 lxde-en-64 lxde-ja-32 lxde-en-32 \ | |
29 | +plasma-ja-64 plasma-en-64 \ | |
30 | +releng-ja-64 releng-en-64 releng-ja-32 releng-en-32 \ | |
31 | +serene-ja-64 serene-en-64 serene-ja-32 serene-en-32 \ | |
32 | +xfce-ja-64 xfce-en-64 xfce-ja-32 xfce-en-32 \ | |
33 | +xfce-pro-ja-64 xfce-pro-en-64 \ | |
34 | +: | |
19 | 35 | @$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev }) |
20 | - @$(eval CHANNEL=${shell echo ${@} | sed "s/-${ARCHITECTURE}//g"}) | |
36 | + @$(eval LOCALE=${shell echo ${@} | rev | cut -d '-' -f 2 | rev }) | |
37 | + @$(eval CHANNEL=${shell echo ${@} | sed "s/-${LOCALE}-${ARCHITECTURE}//g"}) | |
21 | 38 | @[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || : |
22 | 39 | @case ${ARCHITECTURE} in\ |
23 | - "32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\ | |
24 | - "64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\ | |
40 | + "32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} -l ${LOCALE} ${CHANNEL} ;;\ | |
41 | + "64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} -l ${LOCALE} ${CHANNEL};;\ | |
25 | 42 | * ) echo "Unknown Architecture"; exit 1 ;; \ |
26 | 43 | esac |
27 | 44 | @make clean |
@@ -43,7 +60,7 @@ build_option: | ||
43 | 60 | ${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option |
44 | 61 | |
45 | 62 | clean: |
46 | - @sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm clean | |
63 | + @sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm --debug clean | |
47 | 64 | |
48 | 65 | build:build_option |
49 | 66 | $(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option)) |
@@ -34,7 +34,7 @@ norepopkg=() | ||
34 | 34 | # Load config file |
35 | 35 | [[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1 |
36 | 36 | for config in "${defaultconfig}" "${script_path}/custom.conf"; do |
37 | - [[ -f "${config}" ]] && source "${config}" | |
37 | + [[ -f "${config}" ]] && source "${config}" && loaded_files+=("${config}") | |
38 | 38 | done |
39 | 39 | |
40 | 40 | umask 0022 |
@@ -109,8 +109,7 @@ _usage () { | ||
109 | 109 | for _type in "locale" "kernel"; do |
110 | 110 | echo " ${_type} for each architecture:" |
111 | 111 | for _arch in $(find "${script_path}/system/" -maxdepth 1 -mindepth 1 -name "${_type}-*" -print0 | xargs -I{} -0 basename {} | sed "s|${_type}-||g"); do |
112 | - echo -n " ${_arch}$(echo_blank "$(( "${blank}" - "${#_arch}" ))")" | |
113 | - "${tools_dir}/${_type}.sh" -a "${_arch}" show | |
112 | + echo " ${_arch}$(echo_blank "$(( "${blank}" - "${#_arch}" ))")$("${tools_dir}/${_type}.sh" -a "${_arch}" show)" | |
114 | 113 | done |
115 | 114 | echo |
116 | 115 | done |
@@ -132,7 +131,7 @@ _usage () { | ||
132 | 131 | echo " -x | --bash-debug Enable bash debug mode(set -xv)" |
133 | 132 | echo " --channellist Output the channel list and exit" |
134 | 133 | echo " --config Load additional config file" |
135 | - echo " --gitversion Add Git commit hash to image file version" | |
134 | + echo " --[no]gitversion Add Git commit hash to image file version" | |
136 | 135 | echo " --logpath <file> Set log file path (use with --log)" |
137 | 136 | echo " --[no]log (No) log ;re-run script with tee" |
138 | 137 | echo " --msgdebug Enables output debugging" |
@@ -151,6 +150,7 @@ _usage () { | ||
151 | 150 | echo " --nopkgbuild Ignore PKGBUILD (Use only for debugging)" |
152 | 151 | echo " --tar-type <comp_type> Set compression type (gzip, lzma, lzo, xz, zstd)" |
153 | 152 | echo " --tar-opts <option> Set tar command argument (Use with --tarball)" |
153 | + echo " --add-module <module> Load additional modules (Separated by \",\")" | |
154 | 154 | echo |
155 | 155 | echo " Many packages are installed from AUR, so specifying --noaur can cause problems." |
156 | 156 | echo |
@@ -158,7 +158,7 @@ _usage () { | ||
158 | 158 | } |
159 | 159 | |
160 | 160 | # Unmount helper Usage: _umount <target> |
161 | -_umount() { if mountpoint -q "${1}"; then umount -lf "${1}"; fi; } | |
161 | +_umount() { mountpoint -q "${1}" && umount -lf "${1}"; return 0; } | |
162 | 162 | |
163 | 163 | # Mount helper Usage: _mount <source> <target> |
164 | 164 | _mount() { ! mountpoint -q "${2}" && [[ -f "${1}" ]] && [[ -d "${2}" ]] && mount "${1}" "${2}"; return 0; } |
@@ -180,13 +180,13 @@ mount_airootfs () { | ||
180 | 180 | |
181 | 181 | # Helper function to run make_*() only one time. |
182 | 182 | run_once() { |
183 | - set -eu | |
184 | 183 | if [[ ! -e "${lockfile_dir}/build.${1}" ]]; then |
184 | + umount_work | |
185 | 185 | msg_debug "Running ${1} ..." |
186 | 186 | mount_airootfs |
187 | 187 | eval "${@}" |
188 | 188 | mkdir -p "${lockfile_dir}"; touch "${lockfile_dir}/build.${1}" |
189 | - umount_work | |
189 | + | |
190 | 190 | else |
191 | 191 | msg_debug "Skipped because ${1} has already been executed." |
192 | 192 | fi |
@@ -246,7 +246,7 @@ _run_with_pacmanconf(){ | ||
246 | 246 | # コマンドをchrootで実行する |
247 | 247 | _chroot_run() { |
248 | 248 | msg_debug "Run command in chroot\nCommand: ${*}" |
249 | - eval -- arch-chroot "${airootfs_dir}" "${@}" | |
249 | + arch-chroot "${airootfs_dir}" "${@}" || return "${?}" | |
250 | 250 | } |
251 | 251 | |
252 | 252 | _cleanup_common () { |
@@ -334,7 +334,7 @@ prepare_env() { | ||
334 | 334 | # Load loop kernel module |
335 | 335 | if [[ "${noloopmod}" = false ]]; then |
336 | 336 | [[ ! -d "/usr/lib/modules/$(uname -r)" ]] && msg_error "The currently running kernel module could not be found.\nProbably the system kernel has been updated.\nReboot your system to run the latest kernel." "1" |
337 | - lsmod | getclm 1 | grep -x "loop" || modprobe loop | |
337 | + lsmod | getclm 1 | grep -qx "loop" || modprobe loop | |
338 | 338 | fi |
339 | 339 | |
340 | 340 | # Check work dir |
@@ -407,6 +407,9 @@ prepare_build() { | ||
407 | 407 | # Load configs |
408 | 408 | load_config "${channel_dir}/config.any" "${channel_dir}/config.${arch}" |
409 | 409 | |
410 | + # Additional modules | |
411 | + modules+=("${additional_modules[@]}") | |
412 | + | |
410 | 413 | # Legacy mode |
411 | 414 | if [[ "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "${channel_name}")" = "3.0" ]]; then |
412 | 415 | msg_warn "The module cannot be used because it works with Alter ISO3.0 compatibility." |
@@ -416,7 +419,7 @@ prepare_build() { | ||
416 | 419 | |
417 | 420 | # Load presets |
418 | 421 | local _modules=() module_check |
419 | - for_module '[[ -f "${preset_dir}/{}" ]] && readarray -t -O "${#_modules[@]}" _modules < <(cat "${preset_dir}/{}") || _modules+=("{}")' | |
422 | + for_module '[[ -f "${preset_dir}/{}" ]] && readarray -t -O "${#_modules[@]}" _modules < <(grep -h -v ^'#' "${preset_dir}/{}") || _modules+=("{}")' | |
420 | 423 | modules=("${_modules[@]}") |
421 | 424 | unset _modules |
422 | 425 |
@@ -445,6 +448,7 @@ prepare_build() { | ||
445 | 448 | [[ "${customized_password}" = false ]] && password="${defaultpassword}" |
446 | 449 | |
447 | 450 | # gitversion |
451 | + [[ ! -d "${script_path}/.git" ]] && [[ "${gitversion}" = true ]] && msg_error "There is no git directory. You need to use git clone to use this feature." "1" | |
448 | 452 | [[ "${gitversion}" = true ]] && iso_version="${iso_version}-${gitrev}" |
449 | 453 | |
450 | 454 | # Generate tar file name |
@@ -578,6 +582,7 @@ make_packages_aur() { | ||
578 | 582 | |
579 | 583 | # prepare for yay |
580 | 584 | cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh" |
585 | + _pacstrap --asdeps --needed "go" # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない | |
581 | 586 | |
582 | 587 | # Run aur script |
583 | 588 | _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}" |
@@ -654,10 +659,10 @@ make_customize_airootfs() { | ||
654 | 659 | # -k changed in AlterISO3 from passing kernel name to passing kernel configuration. |
655 | 660 | |
656 | 661 | # Generate options of customize_airootfs.sh. |
657 | - _airootfs_script_options="-p '${password}' -k '${kernel} ${kernel_filename} ${kernel_mkinitcpio_profile}' -u '${username}' -o '${os_name}' -i '${install_dir}' -s '${usershell}' -a '${arch}' -g '${locale_gen_name}' -l '${locale_name}' -z '${locale_time}' -t ${theme_name}" | |
658 | - [[ "${boot_splash}" = true ]] && _airootfs_script_options="${_airootfs_script_options} -b" | |
659 | - [[ "${debug}" = true ]] && _airootfs_script_options="${_airootfs_script_options} -d" | |
660 | - [[ "${bash_debug}" = true ]] && _airootfs_script_options="${_airootfs_script_options} -x" | |
662 | + _airootfs_script_options=(-p "${password}" -k "${kernel} ${kernel_filename} ${kernel_mkinitcpio_profile}" -u "${username}" -o "${os_name}" -i "${install_dir}" -s "${usershell}" -a "${arch}" -g "${locale_gen_name}" -l "${locale_name}" -z "${locale_time}" -t "${theme_name}") | |
663 | + [[ "${boot_splash}" = true ]] && _airootfs_script_options+=("-b") | |
664 | + [[ "${debug}" = true ]] && _airootfs_script_options+=("-d") | |
665 | + [[ "${bash_debug}" = true ]] && _airootfs_script_options+=("-x") | |
661 | 666 | |
662 | 667 | _main_script="root/customize_airootfs.sh" |
663 | 668 |
@@ -671,7 +676,7 @@ make_customize_airootfs() { | ||
671 | 676 | # Create script |
672 | 677 | for _script in "${_script_list[@]}"; do |
673 | 678 | if [[ -f "${_script}" ]]; then |
674 | - (echo && cat "${_script}") >> "${airootfs_dir}/${_main_script}" | |
679 | + (echo -e "\n#--$(basename "${_script}")--#\n" && cat "${_script}") >> "${airootfs_dir}/${_main_script}" | |
675 | 680 | remove "${_script}" |
676 | 681 | else |
677 | 682 | msg_debug "${_script} was not found." |
@@ -679,8 +684,8 @@ make_customize_airootfs() { | ||
679 | 684 | done |
680 | 685 | |
681 | 686 | chmod 755 "${airootfs_dir}/${_main_script}" |
682 | - cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename ${_main_script})" | |
683 | - _chroot_run "${_main_script} ${_airootfs_script_options}" | |
687 | + cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename "${_main_script}")" | |
688 | + _chroot_run "${_main_script}" "${_airootfs_script_options[@]}" | |
684 | 689 | remove "${airootfs_dir}/${_main_script}" |
685 | 690 | |
686 | 691 | # /root permission https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59 |
@@ -702,17 +707,15 @@ make_setup_mkinitcpio() { | ||
702 | 707 | sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${airootfs_dir}/etc/initcpio/install/archiso_shutdown" |
703 | 708 | cp "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install" |
704 | 709 | cp "${script_path}/system/initcpio/archiso_shutdown" "${airootfs_dir}/etc/initcpio" |
705 | - if [[ "${boot_splash}" = true ]]; then | |
706 | - cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf" | |
707 | - else | |
708 | - cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf" | |
709 | - fi | |
710 | + cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf" | |
711 | + [[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf" | |
712 | + | |
710 | 713 | if [[ "${gpg_key}" ]]; then |
711 | 714 | gpg --export "${gpg_key}" >"${build_dir}/gpgkey" |
712 | 715 | exec 17<>"${build_dir}/gpgkey" |
713 | 716 | fi |
714 | 717 | |
715 | - _chroot_run "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/${kernel_filename} -g /boot/archiso.img" | |
718 | + _chroot_run mkinitcpio -c "/etc/mkinitcpio-archiso.conf" -k "/boot/${kernel_filename}" -g "/boot/archiso.img" | |
716 | 719 | |
717 | 720 | [[ "${gpg_key}" ]] && exec 17<&- |
718 | 721 |
@@ -761,9 +764,7 @@ make_syslinux() { | ||
761 | 764 | # 一時ディレクトリに設定ファイルをコピー |
762 | 765 | mkdir -p "${build_dir}/syslinux/" |
763 | 766 | cp -a "${script_path}/syslinux/"* "${build_dir}/syslinux/" |
764 | - if [[ -d "${channel_dir}/syslinux" ]] && [[ "${customized_syslinux}" = true ]]; then | |
765 | - cp -af "${channel_dir}/syslinux"* "${build_dir}/syslinux/" | |
766 | - fi | |
767 | + [[ -d "${channel_dir}/syslinux" ]] && [[ "${customized_syslinux}" = true ]] && cp -af "${channel_dir}/syslinux"* "${build_dir}/syslinux/" | |
767 | 768 | |
768 | 769 | # copy all syslinux config to work dir |
769 | 770 | for _cfg in "${build_dir}/syslinux/"*.cfg; do |
@@ -775,13 +776,10 @@ make_syslinux() { | ||
775 | 776 | done |
776 | 777 | |
777 | 778 | # Replace the SYSLINUX configuration file with or without boot splash. |
778 | - local _use_config_name _no_use_config_name _pxe_or_sys | |
779 | + local _use_config_name="nosplash" _no_use_config_name="splash" _pxe_or_sys | |
779 | 780 | if [[ "${boot_splash}" = true ]]; then |
780 | 781 | _use_config_name=splash |
781 | 782 | _no_use_config_name=nosplash |
782 | - else | |
783 | - _use_config_name=nosplash | |
784 | - _no_use_config_name=splash | |
785 | 783 | fi |
786 | 784 | for _pxe_or_sys in "sys" "pxe"; do |
787 | 785 | remove "${isofs_dir}/syslinux/archiso_${_pxe_or_sys}_${_no_use_config_name}.cfg" |
@@ -789,11 +787,8 @@ make_syslinux() { | ||
789 | 787 | done |
790 | 788 | |
791 | 789 | # Set syslinux wallpaper |
792 | - if [[ -f "${channel_dir}/splash.png" ]]; then | |
793 | - cp "${channel_dir}/splash.png" "${isofs_dir}/syslinux" | |
794 | - else | |
795 | - cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux" | |
796 | - fi | |
790 | + cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux" | |
791 | + [[ -f "${channel_dir}/splash.png" ]] && cp -f "${channel_dir}/splash.png" "${isofs_dir}/syslinux" | |
797 | 792 | |
798 | 793 | # remove config |
799 | 794 | local _remove_config |
@@ -998,9 +993,9 @@ make_alteriso_info(){ | ||
998 | 993 | # iso version info |
999 | 994 | if [[ "${include_info}" = true ]]; then |
1000 | 995 | local _info_file="${isofs_dir}/alteriso-info" _version="${iso_version}" |
1001 | - remove "${_info_file}"; touch "${_info_file}" | |
996 | + #remove "${_info_file}"; touch "${_info_file}" | |
1002 | 997 | [[ -d "${script_path}/.git" ]] && [[ "${gitversion}" = false ]] && _version="${iso_version}-${gitrev}" |
1003 | - "${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}" | |
998 | + "${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[@]}")" | |
1004 | 999 | fi |
1005 | 1000 | |
1006 | 1001 | return 0 |
@@ -1055,7 +1050,7 @@ make_iso() { | ||
1055 | 1050 | # Parse options |
1056 | 1051 | ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}") |
1057 | 1052 | OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x") |
1058 | -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:") | |
1053 | +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") | |
1059 | 1054 | OPT="$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}")" || exit 1 |
1060 | 1055 | |
1061 | 1056 | eval set -- "${OPT}" |
@@ -1064,14 +1059,6 @@ unset OPT OPTS OPTL DEFAULT_ARGUMENT | ||
1064 | 1059 | |
1065 | 1060 | while true; do |
1066 | 1061 | case "${1}" in |
1067 | - -a | --arch) | |
1068 | - arch="${2}" | |
1069 | - shift 2 | |
1070 | - ;; | |
1071 | - -b | --boot-splash) | |
1072 | - boot_splash=true | |
1073 | - shift 1 | |
1074 | - ;; | |
1075 | 1062 | -c | --comp-type) |
1076 | 1063 | case "${2}" in |
1077 | 1064 | "gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") sfs_comp="${2}" ;; |
@@ -1079,21 +1066,6 @@ while true; do | ||
1079 | 1066 | esac |
1080 | 1067 | shift 2 |
1081 | 1068 | ;; |
1082 | - -d | --debug) | |
1083 | - debug=true | |
1084 | - shift 1 | |
1085 | - ;; | |
1086 | - -e | --cleaning | --cleanup) | |
1087 | - cleaning=true | |
1088 | - shift 1 | |
1089 | - ;; | |
1090 | - -g | --gpgkey) | |
1091 | - gpg_key="${2}" | |
1092 | - shift 2 | |
1093 | - ;; | |
1094 | - -h | --help) | |
1095 | - _usage 0 | |
1096 | - ;; | |
1097 | 1069 | -j | --japanese) |
1098 | 1070 | msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1" |
1099 | 1071 | ;; |
@@ -1102,23 +1074,11 @@ while true; do | ||
1102 | 1074 | kernel="${2}" |
1103 | 1075 | shift 2 |
1104 | 1076 | ;; |
1105 | - -l | --lang) | |
1106 | - locale_name="${2}" | |
1107 | - shift 2 | |
1108 | - ;; | |
1109 | - -o | --out) | |
1110 | - out_dir="${2}" | |
1111 | - shift 2 | |
1112 | - ;; | |
1113 | 1077 | -p | --password) |
1114 | 1078 | customized_password=true |
1115 | 1079 | password="${2}" |
1116 | 1080 | shift 2 |
1117 | 1081 | ;; |
1118 | - -r | --tarball) | |
1119 | - tarball=true | |
1120 | - shift 1 | |
1121 | - ;; | |
1122 | 1082 | -t | --comp-opts) |
1123 | 1083 | if [[ "${2}" = "reset" ]]; then |
1124 | 1084 | sfs_comp_opt=() |
@@ -1132,106 +1092,17 @@ while true; do | ||
1132 | 1092 | username="$(echo -n "${2}" | sed 's/ //g' | tr '[:upper:]' '[:lower:]')" |
1133 | 1093 | shift 2 |
1134 | 1094 | ;; |
1135 | - -w | --work) | |
1136 | - work_dir="${2}" | |
1137 | - shift 2 | |
1138 | - ;; | |
1139 | - -x | --bash-debug) | |
1140 | - debug=true | |
1141 | - bash_debug=true | |
1142 | - shift 1 | |
1143 | - ;; | |
1144 | - --noconfirm) | |
1145 | - noconfirm=true | |
1146 | - shift 1 | |
1147 | - ;; | |
1148 | - --confirm) | |
1149 | - noconfirm=false | |
1150 | - shift 1 | |
1151 | - ;; | |
1152 | - --nodepend) | |
1153 | - nodepend=true | |
1154 | - shift 1 | |
1155 | - ;; | |
1156 | - --nocolor) | |
1157 | - nocolor=true | |
1158 | - shift 1 | |
1159 | - ;; | |
1160 | - --gitversion) | |
1161 | - if [[ -d "${script_path}/.git" ]]; then | |
1162 | - gitversion=true | |
1163 | - else | |
1164 | - msg_error "There is no git directory. You need to use git clone to use this feature." "1" | |
1165 | - fi | |
1166 | - shift 1 | |
1167 | - ;; | |
1168 | - --msgdebug) | |
1169 | - msgdebug=true; | |
1170 | - shift 1 | |
1171 | - ;; | |
1172 | - --noloopmod) | |
1173 | - noloopmod=true | |
1174 | - shift 1 | |
1175 | - ;; | |
1176 | - --noiso) | |
1177 | - noiso=true | |
1178 | - shift 1 | |
1179 | - ;; | |
1180 | - --noaur) | |
1181 | - noaur=true | |
1182 | - shift 1 | |
1183 | - ;; | |
1184 | - --nochkver) | |
1185 | - nochkver=true | |
1186 | - shift 1 | |
1187 | - ;; | |
1188 | 1095 | --nodebug) |
1189 | 1096 | debug=false |
1190 | 1097 | msgdebug=false |
1191 | 1098 | bash_debug=false |
1192 | 1099 | shift 1 |
1193 | 1100 | ;; |
1194 | - --noefi) | |
1195 | - noefi=true | |
1196 | - shift 1 | |
1197 | - ;; | |
1198 | - --channellist) | |
1199 | - show_channel_list | |
1200 | - exit 0 | |
1201 | - ;; | |
1202 | - --config) | |
1203 | - source "${2}" | |
1204 | - shift 2 | |
1205 | - ;; | |
1206 | - --pacman-debug) | |
1207 | - pacman_debug=true | |
1208 | - shift 1 | |
1209 | - ;; | |
1210 | - --nosigcheck) | |
1211 | - nosigcheck=true | |
1212 | - shift 1 | |
1213 | - ;; | |
1214 | - --normwork) | |
1215 | - normwork=true | |
1216 | - shift 1 | |
1217 | - ;; | |
1218 | - --log) | |
1219 | - logging=true | |
1220 | - shift 1 | |
1221 | - ;; | |
1222 | 1101 | --logpath) |
1223 | 1102 | logging="${2}" |
1224 | 1103 | customized_logpath=true |
1225 | 1104 | shift 2 |
1226 | 1105 | ;; |
1227 | - --nolog) | |
1228 | - logging=false | |
1229 | - shift 1 | |
1230 | - ;; | |
1231 | - --nopkgbuild) | |
1232 | - nopkgbuild=true | |
1233 | - shift 1 | |
1234 | - ;; | |
1235 | 1106 | --tar-type) |
1236 | 1107 | case "${2}" in |
1237 | 1108 | "gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") tar_comp="${2}" ;; |
@@ -1243,10 +1114,43 @@ while true; do | ||
1243 | 1114 | IFS=" " read -r -a tar_comp_opt <<< "${2}" |
1244 | 1115 | shift 2 |
1245 | 1116 | ;; |
1246 | - --) | |
1247 | - shift | |
1248 | - break | |
1117 | + --add-module) | |
1118 | + readarray -t -O "${#additional_modules[@]}" additional_modules < <(echo "${2}" | tr "," "\n") | |
1119 | + msg_debug "Added modules: ${additional_modules[*]}" | |
1120 | + shift 2 | |
1249 | 1121 | ;; |
1122 | + -g | --gpgkey ) gpg_key="${2}" && shift 2 ;; | |
1123 | + -h | --help ) _usage 0 ;; | |
1124 | + -a | --arch ) arch="${2}" && shift 2 ;; | |
1125 | + -d | --debug ) debug=true && shift 1 ;; | |
1126 | + -e | --cleaning | --cleanup ) cleaning=true && shift 1 ;; | |
1127 | + -b | --boot-splash ) boot_splash=true && shift 1 ;; | |
1128 | + -l | --lang ) locale_name="${2}" && shift 2 ;; | |
1129 | + -o | --out ) out_dir="${2}" && shift 2 ;; | |
1130 | + -r | --tarball ) tarball=true && shift 1 ;; | |
1131 | + -w | --work ) work_dir="${2}" && shift 2 ;; | |
1132 | + -x | --bash-debug ) bash_debug=true && shift 1 ;; | |
1133 | + --gitversion ) gitversion=true && shift 1 ;; | |
1134 | + --noconfirm ) noconfirm=true && shift 1 ;; | |
1135 | + --confirm ) noconfirm=false && shift 1 ;; | |
1136 | + --nodepend ) nodepend=true && shift 1 ;; | |
1137 | + --nocolor ) nocolor=true && shift 1 ;; | |
1138 | + --msgdebug ) msgdebug=true && shift 1 ;; | |
1139 | + --noloopmod ) noloopmod=true && shift 1 ;; | |
1140 | + --noiso ) noiso=true && shift 1 ;; | |
1141 | + --noaur ) noaur=true && shift 1 ;; | |
1142 | + --nochkver ) nochkver=true && shift 1 ;; | |
1143 | + --noefi ) noefi=true && shift 1 ;; | |
1144 | + --channellist ) show_channel_list && exit 0 ;; | |
1145 | + --config ) source "${2}" && shift 2 ;; | |
1146 | + --pacman-debug ) pacman_debug=true && shift 1 ;; | |
1147 | + --nosigcheck ) nosigcheck=true && shift 1 ;; | |
1148 | + --normwork ) normwork=true && shift 1 ;; | |
1149 | + --log ) logging=true && shift 1 ;; | |
1150 | + --nolog ) logging=false && shift 1 ;; | |
1151 | + --nopkgbuild ) nopkgbuild=true && shift 1 ;; | |
1152 | + --nogitversion ) gitversion=false && shift 1 ;; | |
1153 | + -- ) shift 1 && break ;; | |
1250 | 1154 | *) |
1251 | 1155 | msg_error "Argument exception error '${1}'" |
1252 | 1156 | msg_error "Please report this error to the developer." 1 |
@@ -1298,7 +1202,6 @@ for _dir in build_dir cache_dir airootfs_dir isofs_dir lockfile_dir out_dir; do | ||
1298 | 1202 | eval "${_dir}=\"$(realpath "$(eval "echo \$${_dir}")")\"" |
1299 | 1203 | done |
1300 | 1204 | |
1301 | - | |
1302 | 1205 | # Set for special channels |
1303 | 1206 | if [[ -d "${channel_dir}.add" ]]; then |
1304 | 1207 | channel_name="${1}" |
@@ -1319,8 +1222,6 @@ if [[ ! "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "$ | ||
1319 | 1222 | fi |
1320 | 1223 | fi |
1321 | 1224 | |
1322 | -set -eu | |
1323 | - | |
1324 | 1225 | prepare_env |
1325 | 1226 | prepare_build |
1326 | 1227 | show_settings |
@@ -67,25 +67,15 @@ app-picker-view=uint32 0 | ||
67 | 67 | disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com'] |
68 | 68 | enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com'] |
69 | 69 | favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop'] |
70 | +welcome-dialog-last-shown-version='999999999' | |
70 | 71 | |
71 | 72 | [org/gnome/shell/extensions/arc-menu] |
72 | -application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']] | |
73 | -arc-menu-placement='DTD' | |
74 | 73 | button-icon-padding=0 |
75 | -custom-menu-button-icon='/usr/share/icons/hicolor/128x128/apps/alter.png' | |
76 | -custom-menu-button-icon-size=24.0 | |
77 | -disable-activities-button=true | |
78 | -disable-tooltips=false | |
79 | 74 | dtp-dtd-state=[true, true] |
80 | -enable-custom-arc-menu=false | |
81 | 75 | enable-menu-button-arrow=false |
82 | -menu-button-icon='Custom_Icon' | |
83 | -pinned-app-list=['Chromium', 'chromium', 'chromium.desktop', 'LibreOffice', 'libreoffice-startcenter', 'libreoffice-startcenter.desktop', 'VLC Media Player', 'vlc', 'vlc.desktop', 'System Monitor', 'org.gnome.SystemMonitor', 'gnome-system-monitor.desktop', 'Terminal', 'org.gnome.Terminal', 'org.gnome.Terminal.desktop', 'Settings', 'org.gnome.Settings', 'gnome-control-center.desktop'] | |
84 | 76 | position-in-panel='Left' |
85 | 77 | recently-installed-apps=@as [] |
86 | 78 | show-external-devices=true |
87 | -show-lock-button=false | |
88 | -show-logout-button=false | |
89 | 79 | show-suspend-button=false |
90 | 80 | |
91 | 81 | [org/gnome/shell/extensions/arcmenu] |
@@ -105,6 +95,7 @@ enable-sub-menus=false | ||
105 | 95 | extra-categories=[(0, true), (1, true), (2, true), (3, true), (4, false)] |
106 | 96 | menu-button-icon='Custom_Icon' |
107 | 97 | menu-height=550 |
98 | +menu-hotkey='Super_L' | |
108 | 99 | menu-layout='Windows' |
109 | 100 | menu-width=290 |
110 | 101 | pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop', 'medit', '', 'medit.desktop'] |
@@ -136,23 +127,30 @@ position='Bottom' | ||
136 | 127 | switcher-style='Timeline' |
137 | 128 | |
138 | 129 | [org/gnome/shell/extensions/dash-to-panel] |
139 | -appicon-margin=4 | |
130 | +animate-appicon-hover-animation-extent={'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1} | |
131 | +appicon-padding=4 | |
140 | 132 | available-monitors=[0] |
141 | 133 | dot-position='BOTTOM' |
142 | 134 | group-apps=true |
143 | 135 | hotkeys-overlay-combo='TEMPORARILY' |
144 | 136 | intellihide=false |
145 | 137 | isolate-workspaces=true |
146 | -panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' | |
138 | +leftbox-padding=-1 | |
139 | +panel-anchors='{"0":"MIDDLE"}' | |
140 | +panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}' | |
141 | +panel-lengths='{"0":100}' | |
147 | 142 | panel-positions='{"0":"BOTTOM"}' |
148 | -panel-size=32 | |
143 | +panel-sizes='{"0":32}' | |
149 | 144 | secondarymenu-contains-showdetails=true |
150 | 145 | show-appmenu=false |
151 | 146 | show-apps-icon-file='' |
147 | +status-icon-padding=-1 | |
152 | 148 | stockgs-keep-dash=true |
153 | 149 | stockgs-keep-top-panel=false |
154 | 150 | stockgs-panelbtn-click-only=false |
155 | 151 | taskbar-locked=false |
152 | +tray-padding=-1 | |
153 | +window-preview-title-position='TOP' | |
156 | 154 | |
157 | 155 | [org/gnome/shell/extensions/ding] |
158 | 156 | icon-size='small' |
@@ -26,3 +26,10 @@ function remove_userfile() { | ||
26 | 26 | } |
27 | 27 | remove_userfile "Desktop/calamares.desktop" |
28 | 28 | #remove_userfile ".config/autostart/genicon.desktop" |
29 | + | |
30 | +# Optimize for i686 | |
31 | +if [[ "${arch}" = "i686" ]]; then | |
32 | + for _file in "/etc/dconf/db/local.d/01-alter-gnome" "/etc/dconf/db/local.d/02-live-installer-panel"; do | |
33 | + sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}" | |
34 | + done | |
35 | +fi |
@@ -8,3 +8,4 @@ | ||
8 | 8 | # Supported architecture list |
9 | 9 | |
10 | 10 | x86_64 |
11 | +i686 |
@@ -0,0 +1,3 @@ | ||
1 | +xf86-input-synaptics | |
2 | +alterlinux-medit-themes | |
3 | +medit |
@@ -0,0 +1,11 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | + | |
11 | +gedit |
@@ -0,0 +1,12 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# Gnome extensions | |
11 | + | |
12 | +gnome-shell-extension-appindicator |
@@ -0,0 +1,58 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# Gnome | |
11 | + | |
12 | + | |
13 | +#-- gnome --# | |
14 | +gnome-backgrounds | |
15 | +gnome-boxes | |
16 | +gnome-calculator | |
17 | +gnome-calendar | |
18 | +gnome-control-center | |
19 | +gnome-common | |
20 | +gnome-desktop | |
21 | +gnome-disk-utility | |
22 | +gnome-keyring | |
23 | +gnome-logs | |
24 | +gnome-menus | |
25 | +gnome-remote-desktop | |
26 | +gnome-screenshot | |
27 | +gnome-session | |
28 | +gnome-settings-daemon | |
29 | +gnome-shell | |
30 | +gnome-shell-extensions | |
31 | +gnome-system-monitor | |
32 | +gnome-terminal | |
33 | +mutter | |
34 | +nautilus | |
35 | +sushi | |
36 | + | |
37 | + | |
38 | +#-- gnome-extra --# | |
39 | +dconf-editor | |
40 | +gnome-tweaks | |
41 | + | |
42 | + | |
43 | +#-- Display manager --# | |
44 | +gdm | |
45 | + | |
46 | +#-- other --# | |
47 | +gnome-bluetooth | |
48 | +gnome-epub-thumbnailer | |
49 | + | |
50 | +#aur build | |
51 | +meson | |
52 | +ninja | |
53 | +jq | |
54 | +oniguruma | |
55 | + | |
56 | +# libinput | |
57 | +xf86-input-libinput | |
58 | + |
@@ -0,0 +1,16 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# look and feel | |
11 | + | |
12 | +# icon | |
13 | +papirus-icon-theme | |
14 | + | |
15 | +# theme | |
16 | +materia-gtk-theme |
@@ -0,0 +1,20 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# Gnome extensions | |
11 | + | |
12 | +chrome-gnome-shell | |
13 | + | |
14 | +gnome-shell-extension-arc-menu | |
15 | +gnome-shell-extension-clipboard-indicator | |
16 | +gnome-shell-extension-coverflow-alt-tab | |
17 | +gnome-shell-extension-dash-to-panel | |
18 | +gnome-shell-extension-desktop-icons-ng | |
19 | +gnome-shell-extension-extensions | |
20 | +#gnome-shell-extension-topicons-redux |
@@ -0,0 +1,12 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | + | |
11 | +#-- wallpaper --# | |
12 | +alterlinux-wallpapers |
@@ -285,6 +285,11 @@ gitversion=false | ||
285 | 285 | # This setting cannot be changed by an argument. |
286 | 286 | additional_exclude_pkg=() |
287 | 287 | |
288 | +# Additional list of modules to load | |
289 | +# Use this array for debugging only | |
290 | +# This setting cannot be changed by an argument. | |
291 | +additional_modules=() | |
292 | + | |
288 | 293 | # Run with tee command |
289 | 294 | # Set to "false" to disable logging |
290 | 295 | # If not false, the log will be saved in the specified path. |
@@ -60,28 +60,35 @@ | ||
60 | 60 | </b> |
61 | 61 | |
62 | 62 | <h2>〈Overview〉</h2> |
63 | - | |
64 | 63 | Alter Linux is a new OS developed based on Arch Linux.<br> |
65 | 64 | Check the <a href="https://github.com/orgs/FascodeNet/projects/2">project board</a> for the latest status of Alter Linux.<br> |
66 | 65 | Please see the <a href="https://fascode.net/projects/linux/alter/">official website</a> for information on announcements and bugs for users. |
67 | 66 | |
67 | +<h2>〈Download〉</h2> | |
68 | +The image file can be downloaded from the official <a href="https://fascode.net/projects/linux/alter/#downloads">website</a>. | |
69 | +<br> | |
70 | +<b>We are looking for a mirror server provider for repositories and image file distribution.</b> | |
71 | +<br> | |
72 | +If you would like us to provide a mirror please contact the developer's Twitter. | |
73 | + | |
74 | +<h2>〈Screenshots〉</h2> | |
68 | 75 | <h3>Xfce</h3> |
69 | -<img src="../images/screenshot/desktop-xfce.png" alt="screenshot"> | |
76 | +<img src="../images/screenshot/desktop-xfce.png" alt="screenshot" width="50%"> | |
70 | 77 | |
71 | 78 | <h3>Plasma</h3> |
72 | -<img src="../images/screenshot/desktop-plasma.png" alt="screenshot"> | |
79 | +<img src="../images/screenshot/desktop-plasma.png" alt="screenshot" width="50%"> | |
73 | 80 | |
74 | 81 | <h3>Lxde</h3> |
75 | -<img src="../images/screenshot/desktop-lxde.png" alt="screenshot"> | |
82 | +<img src="../images/screenshot/desktop-lxde.png" alt="screenshot" width="50%"> | |
76 | 83 | |
77 | 84 | <h3>Gnome</h3> |
78 | -<img src="../images/screenshot/desktop-gnome.png" alt="screenshot"> | |
85 | +<img src="../images/screenshot/desktop-gnome.png" alt="screenshot" width="50%"> | |
79 | 86 | |
80 | 87 | <h3>Cinnamon</h3> |
81 | -<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot"> | |
88 | +<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot" width="50%"> | |
82 | 89 | |
83 | 90 | <h3>i3wm</h3> |
84 | -<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot"> | |
91 | +<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot" width="50%"> | |
85 | 92 | |
86 | 93 | <h2>〈Feature〉</h2> |
87 | 94 | <ul> |
@@ -95,13 +102,6 @@ Please see the <a href="https://fascode.net/projects/linux/alter/">official webs | ||
95 | 102 | <li>Easy development of derived OS by framework based on archiso</li> |
96 | 103 | </ul> |
97 | 104 | |
98 | -<h2>〈Download〉</h2> | |
99 | -The image file can be downloaded from the official <a href="https://fascode.net/projects/linux/alter/#downloads">website</a>. | |
100 | -<br> | |
101 | -<b>We are looking for a mirror server provider for repositories and image file distribution.</b> | |
102 | -<br> | |
103 | -If you would like us to provide a mirror please contact the developer's Twitter. | |
104 | - | |
105 | 105 | <h2>〈Branch〉</h2> |
106 | 106 | These are a list of major branches. Other branches are temporary or used for specific purposes. |
107 | 107 |
@@ -57,28 +57,35 @@ | ||
57 | 57 | </table> |
58 | 58 | |
59 | 59 | <h2>〈概要〉</h2> |
60 | - | |
61 | 60 | Alter LinuxはArch Linuxをベースに開発されている新しいOSです。<br> |
62 | 61 | Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNet/projects/2">プロジェクトボード</a>を確認してください。<br> |
63 | 62 | ユーザ向けのアナウンスや不具合等の情報は<a href="https://fascode.net/projects/linux/alter/">公式サイト</a>をご覧ください。 |
64 | 63 | |
64 | +<h2>〈ダウンロード〉</h2> | |
65 | +イメージファイルは<a href="https://fascode.net/projects/linux/alter/#downloads">公式サイト</a>からダウンロードできます。 | |
66 | +<br> | |
67 | +<b>私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。</b> | |
68 | +<br> | |
69 | +もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。 | |
70 | + | |
71 | +<h2>〈Screenshots〉</h2> | |
65 | 72 | <h3>Xfce</h3> |
66 | -<img src="../images/screenshot/desktop-xfce.png" alt="screenshot"> | |
73 | +<img src="../images/screenshot/desktop-xfce.png" alt="screenshot" width="50%"> | |
67 | 74 | |
68 | 75 | <h3>Plasma</h3> |
69 | -<img src="../images/screenshot/desktop-plasma.png" alt="screenshot"> | |
76 | +<img src="../images/screenshot/desktop-plasma.png" alt="screenshot" width="50%"> | |
70 | 77 | |
71 | 78 | <h3>Lxde</h3> |
72 | -<img src="../images/screenshot/desktop-lxde.png" alt="screenshot"> | |
79 | +<img src="../images/screenshot/desktop-lxde.png" alt="screenshot" width="50%"> | |
73 | 80 | |
74 | 81 | <h3>Gnome</h3> |
75 | -<img src="../images/screenshot/desktop-gnome.png" alt="screenshot"> | |
82 | +<img src="../images/screenshot/desktop-gnome.png" alt="screenshot" width="50%"> | |
76 | 83 | |
77 | 84 | <h3>Cinnamon</h3> |
78 | -<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot"> | |
85 | +<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot" width="50%"> | |
79 | 86 | |
80 | 87 | <h3>i3wm</h3> |
81 | -<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot"> | |
88 | +<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot" width="50%"> | |
82 | 89 | |
83 | 90 | <h2>〈特徴〉</h2> |
84 | 91 | <ul> |
@@ -93,14 +100,6 @@ Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNe | ||
93 | 100 | <li>archisoをベースとしたフレームワークにより簡単に派生OSを開発できます</li> |
94 | 101 | </ul> |
95 | 102 | |
96 | -<h2>〈ダウンロード〉</h2> | |
97 | -イメージファイルは<a href="https://fascode.net/projects/linux/alter/#downloads">公式サイト</a>からダウンロードできます。 | |
98 | -<br> | |
99 | -<b>私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。</b> | |
100 | -<br> | |
101 | -もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。 | |
102 | - | |
103 | - | |
104 | 103 | <h2>〈ブランチ〉</h2> |
105 | 104 | 主要なブランチは以下のとおりです。これ以外のブランチは一時的なものや特定の用途で使われているものです。 |
106 | 105 |
@@ -9,9 +9,10 @@ | ||
9 | 9 | |
10 | 10 | # Enable gdm to auto login |
11 | 11 | if [[ "${boot_splash}" = true ]]; then |
12 | - systemctl enable gdm-plymouth.service | |
12 | + _safe_systemctl enable gdm-plymouth.service | |
13 | + | |
13 | 14 | else |
14 | - systemctl enable gdm.service | |
15 | + _safe_systemctl enable gdm.service | |
15 | 16 | fi |
16 | 17 | |
17 | 18 |
@@ -0,0 +1,12 @@ | ||
1 | +<?xml version="1.0"?> | |
2 | +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | |
3 | +<fontconfig> | |
4 | +<match> | |
5 | + <test name="family"><string>monospace</string></test> | |
6 | + <edit name="family" mode="prepend" binding="strong"> | |
7 | + <string>SauceCodePro Nerd Font Mono</string> | |
8 | + <string>DejaVu Sans Mono</string> | |
9 | + <string>IPAGothic</string> | |
10 | + </edit> | |
11 | +</match> | |
12 | +</fontconfig> |
@@ -0,0 +1,26 @@ | ||
1 | +#!/usr/bin/env bash | |
2 | +# | |
3 | +# Yamada Hayao | |
4 | +# Twitter: @Hayao0819 | |
5 | +# Email : hayao@fascode.net | |
6 | +# | |
7 | +# (c) 2019-2021 Fascode Network. | |
8 | +# | |
9 | + | |
10 | +# Copy config file for getty@.service to kmsconvt@.service | |
11 | +if [[ -f "/etc/systemd/system/getty@.service.d/autologin.conf" ]]; then | |
12 | + mkdir -p "/etc/systemd/system/kmsconvt@.service.d/" | |
13 | + cp "/etc/systemd/system/getty@.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@.service.d/autologin.conf" | |
14 | +fi | |
15 | + | |
16 | +# Disable default tty | |
17 | +_safe_systemctl disable "getty@tty1.service" "getty@.service" | |
18 | +_safe_systemctl enable "kmsconvt@tty1.service" | |
19 | +_safe_systemctl enable "kmsconvt@tty2.service" | |
20 | + | |
21 | + | |
22 | +# Do not run setterm | |
23 | +remove /etc/profile.d/disable-beep.sh | |
24 | + | |
25 | +# Run KMSCON for all tty | |
26 | +ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service" |
@@ -0,0 +1 @@ | ||
1 | +alteriso=3.1 |
@@ -0,0 +1,10 @@ | ||
1 | +# | |
2 | +# Yamada Hayao | |
3 | +# Twitter: @Hayao0819 | |
4 | +# Email : hayao@fascode.net | |
5 | +# | |
6 | +# (c) 2019-2021 Fascode Network. | |
7 | +# | |
8 | +# Supported architecture list | |
9 | + | |
10 | +x86_64 |
@@ -0,0 +1,13 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# kmscon packages | |
11 | + | |
12 | +#-- kmscon --# | |
13 | +kmscon |
@@ -0,0 +1,13 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# kmscon packages | |
11 | + | |
12 | +#-- kmscon --# | |
13 | +kmscon |
@@ -0,0 +1,13 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# kmscon packages | |
11 | + | |
12 | +#-- Fonts --# | |
13 | +nerd-fonts-source-code-pro |
@@ -0,0 +1,13 @@ | ||
1 | +# | |
2 | +# Alter Linux package list | |
3 | +# | |
4 | +# Yamada Hayao | |
5 | +# Twitter: @Hayao0819 | |
6 | +# Email : hayao@fascode.net | |
7 | +# | |
8 | +# (c) 2019-2021 Fascode Network. | |
9 | +# | |
10 | +# kmscon packages | |
11 | + | |
12 | +#-- Fonts --# | |
13 | +nerd-fonts-source-code-pro |
@@ -1,7 +1,7 @@ | ||
1 | 1 | #!/usr/bin/env bash |
2 | 2 | |
3 | 3 | # Pipewire |
4 | -# Do not use _systemd_service because pipewire services are not system but user | |
4 | +# Do not use _safe_systemctl because pipewire services are not system but user | |
5 | 5 | # Use flag "--user --global" |
6 | 6 | # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/923 |
7 | 7 | for _service in "pipewire.service" "pipewire-pulse.service"; do |
@@ -9,23 +9,23 @@ | ||
9 | 9 | |
10 | 10 | # Bluetooth |
11 | 11 | rfkill unblock all |
12 | -_systemd_service enable bluetooth | |
12 | +_safe_systemctl enable bluetooth | |
13 | 13 | |
14 | 14 | # Snap |
15 | -_systemd_service enable snapd.apparmor.service | |
16 | -_systemd_service enable apparmor.service | |
17 | -_systemd_service enable snapd.socket | |
18 | -_systemd_service enable snapd.service | |
19 | -_systemd_service enable ufw.service | |
15 | +_safe_systemctl enable snapd.apparmor.service | |
16 | +_safe_systemctl enable apparmor.service | |
17 | +_safe_systemctl enable snapd.socket | |
18 | +_safe_systemctl enable snapd.service | |
19 | +_safe_systemctl enable ufw.service | |
20 | 20 | |
21 | 21 | |
22 | 22 | # Added autologin group to auto login |
23 | -groupadd autologin | |
23 | +_groupadd autologin | |
24 | 24 | usermod -aG autologin ${username} |
25 | 25 | |
26 | 26 | |
27 | 27 | # ntp |
28 | -_systemd_service enable systemd-timesyncd.service | |
28 | +_safe_systemctl enable systemd-timesyncd.service | |
29 | 29 | |
30 | 30 | |
31 | 31 | # Update system datebase |
@@ -37,7 +37,7 @@ Architecture = i686 | ||
37 | 37 | |
38 | 38 | # Misc options |
39 | 39 | #UseSyslog |
40 | -#Color | |
40 | +Color | |
41 | 41 | #NoProgressBar |
42 | 42 | CheckSpace |
43 | 43 | #VerbosePkgLists |
@@ -37,7 +37,7 @@ Architecture = auto | ||
37 | 37 | |
38 | 38 | # Misc options |
39 | 39 | #UseSyslog |
40 | -#Color | |
40 | +Color | |
41 | 41 | #NoProgressBar |
42 | 42 | CheckSpace |
43 | 43 | #VerbosePkgLists |
@@ -9,14 +9,16 @@ | ||
9 | 9 | # |
10 | 10 | # Disk management |
11 | 11 | |
12 | +#-- GUI --# | |
13 | +#baobab | |
14 | +#gnome-disk-utility | |
15 | +#gparted | |
12 | 16 | |
13 | -baobab | |
17 | +#-- CLI --# | |
14 | 18 | clonezilla |
15 | 19 | ddrescue |
16 | 20 | dmraid |
17 | 21 | fsarchiver |
18 | -gnome-disk-utility | |
19 | -gparted | |
20 | 22 | gptfdisk |
21 | 23 | hdparm |
22 | 24 | lvm2 |
@@ -9,14 +9,16 @@ | ||
9 | 9 | # |
10 | 10 | # Disk management |
11 | 11 | |
12 | +#-- GUI --# | |
13 | +#baobab | |
14 | +#gnome-disk-utility | |
15 | +#gparted | |
12 | 16 | |
13 | -baobab | |
17 | +#-- CLI --# | |
14 | 18 | clonezilla |
15 | 19 | ddrescue |
16 | 20 | dmraid |
17 | 21 | fsarchiver |
18 | -gnome-disk-utility | |
19 | -gparted | |
20 | 22 | gptfdisk |
21 | 23 | hdparm |
22 | 24 | lvm2 |
@@ -157,19 +157,19 @@ run_additional_command "gtk-update-icon-cache -f /usr/share/icons/hicolor" | ||
157 | 157 | |
158 | 158 | |
159 | 159 | # Enable graphical. |
160 | -_systemd_service set-default graphical.target | |
160 | +_safe_systemctl set-default graphical.target | |
161 | 161 | |
162 | 162 | |
163 | 163 | # Enable services. |
164 | -_systemd_service enable pacman-init.service | |
165 | -_systemd_service enable cups.service | |
166 | -_systemd_service enable NetworkManager.service | |
167 | -_systemd_service enable alteriso-reflector.service | |
168 | -_systemd_service disable reflector.service | |
164 | +_safe_systemctl enable pacman-init.service | |
165 | +_safe_systemctl enable cups.service | |
166 | +_safe_systemctl enable NetworkManager.service | |
167 | +_safe_systemctl enable alteriso-reflector.service | |
168 | +_safe_systemctl disable reflector.service | |
169 | 169 | |
170 | 170 | |
171 | 171 | # TLP |
172 | 172 | # See ArchWiki for details. |
173 | -_systemd_service enable tlp.service | |
174 | -_systemd_service mask systemd-rfkill.service | |
175 | -_systemd_service mask systemd-rfkill.socket | |
173 | +_safe_systemctl enable tlp.service | |
174 | +_safe_systemctl mask systemd-rfkill.service | |
175 | +_safe_systemctl mask systemd-rfkill.socket |
@@ -15,7 +15,7 @@ | ||
15 | 15 | # Check whether true or false is assigned to the variable. |
16 | 16 | function check_bool() { |
17 | 17 | local |
18 | - case $(eval echo '$'${1}) in | |
18 | + case $(eval echo '$'"${1}") in | |
19 | 19 | true | false) : ;; |
20 | 20 | *) echo "The value ${boot_splash} set is invalid" >&2 ;; |
21 | 21 | esac |
@@ -52,16 +52,16 @@ function installedpkg () { | ||
52 | 52 | fi |
53 | 53 | } |
54 | 54 | |
55 | +# Add group if it does not exist | |
56 | +_groupadd(){ | |
57 | + cut -d ":" -f 1 < "/etc/group" | grep -qx "${1}" && return 0 || groupadd "${1}" | |
58 | +} | |
59 | + | |
55 | 60 | # Create a user. |
56 | 61 | # create_user <username> <password> |
57 | 62 | function create_user () { |
58 | - local _password | |
59 | - local _username | |
63 | + local _username="${1-""}" _password="${2-""}" | |
60 | 64 | |
61 | - _username=${1} | |
62 | - _password=${2} | |
63 | - | |
64 | - set +u | |
65 | 65 | if [[ -z "${_username}" ]]; then |
66 | 66 | echo "User name is not specified." >&2 |
67 | 67 | return 1 |
@@ -70,32 +70,37 @@ function create_user () { | ||
70 | 70 | echo "No password has been specified." >&2 |
71 | 71 | return 1 |
72 | 72 | fi |
73 | - set -u | |
74 | 73 | |
75 | 74 | if ! user_check "${_username}"; then |
76 | - useradd -m -s ${usershell} ${_username} | |
77 | - groupadd sudo | |
78 | - usermod -U -g ${_username} ${_username} | |
79 | - usermod -aG sudo ${_username} | |
80 | - usermod -aG storage ${_username} | |
81 | - cp -aT /etc/skel/ /home/${_username}/ | |
75 | + useradd -m -s "${usershell}" "${_username}" | |
76 | + _groupadd sudo | |
77 | + usermod -U -g "${_username}" "${_username}" | |
78 | + usermod -aG sudo "${_username}" | |
79 | + usermod -aG storage "${_username}" | |
80 | + cp -aT "/etc/skel/" "/home/${_username}/" | |
82 | 81 | fi |
83 | - chmod 700 -R /home/${_username} | |
84 | - chown ${_username}:${_username} -R /home/${_username} | |
85 | - echo -e "${_password}\n${_password}" | passwd ${_username} | |
82 | + chmod 700 -R "/home/${_username}" | |
83 | + chown "${_username}:${_username}" -R "/home/${_username}" | |
84 | + echo -e "${_password}\n${_password}" | passwd "${_username}" | |
86 | 85 | set -u |
87 | 86 | } |
88 | 87 | |
89 | 88 | # systemctl helper |
90 | 89 | # Execute the subcommand only when the specified unit is available. |
91 | -# Usage: _systemd_service <systemctl subcommand> <service1> <service2> ... | |
92 | -_systemd_service(){ | |
90 | +# Usage: _safe_systemctl <systemctl subcommand> <service1> <service2> ... | |
91 | +_safe_systemctl(){ | |
93 | 92 | local _service _command="${1}" |
94 | 93 | shift 1 |
95 | 94 | for _service in "${@}"; do |
96 | 95 | # https://unix.stackexchange.com/questions/539147/systemctl-check-if-a-unit-service-or-target-exists |
97 | 96 | if (( "$(systemctl list-unit-files "${_service}" | wc -l)" > 3 )); then |
98 | - systemctl ${_command} "${_service}" | |
97 | + if [[ "${_command}" = "enable" ]]; then | |
98 | + if [[ "$(systemctl is-enabled "${_service}")" = "enabled" ]]; then | |
99 | + systemctl enable "${_service}" | |
100 | + fi | |
101 | + else | |
102 | + systemctl "${_command}" "${_service}" | |
103 | + fi | |
99 | 104 | else |
100 | 105 | echo "${_service} was not found" >&2 |
101 | 106 | fi |
@@ -1,3 +1,4 @@ | ||
1 | 1 | base |
2 | 2 | share |
3 | 3 | zsh-powerline |
4 | +#kmscon |
@@ -90,7 +90,7 @@ if ! pacman -Qq yay 1> /dev/null 2>&1; then | ||
90 | 90 | |
91 | 91 | # Install depends |
92 | 92 | for _pkg in "${yay_depends[@]}"; do |
93 | - if ! pacman -Qq "${_pkg}" | grep -q "${_pkg}"; then | |
93 | + if ! pacman -Qq "${_pkg}" > /dev/null 2>&1 | grep -q "${_pkg}"; then | |
94 | 94 | pacman -S --asdeps --needed "${pacman_args[@]}" "${_pkg}" |
95 | 95 | remove_list+=("${_pkg}") |
96 | 96 | fi |
@@ -44,7 +44,7 @@ Architecture = i486 | ||
44 | 44 | #NoProgressBar |
45 | 45 | CheckSpace |
46 | 46 | #VerbosePkgLists |
47 | -ParallelDownloads = 5 | |
47 | +ParallelDownloads = 8 | |
48 | 48 | |
49 | 49 | # By default, pacman accepts packages signed by keys that its local keyring |
50 | 50 | # trusts (see pacman-key and its man page), as well as unsigned packages. |
@@ -44,7 +44,7 @@ Architecture = i686 | ||
44 | 44 | #NoProgressBar |
45 | 45 | CheckSpace |
46 | 46 | #VerbosePkgLists |
47 | -ParallelDownloads = 5 | |
47 | +ParallelDownloads = 8 | |
48 | 48 | |
49 | 49 | # By default, pacman accepts packages signed by keys that its local keyring |
50 | 50 | # trusts (see pacman-key and its man page), as well as unsigned packages. |
@@ -44,7 +44,7 @@ Architecture = auto | ||
44 | 44 | #NoProgressBar |
45 | 45 | CheckSpace |
46 | 46 | #VerbosePkgLists |
47 | -ParallelDownloads = 5 | |
47 | +ParallelDownloads = 8 | |
48 | 48 | |
49 | 49 | # By default, pacman accepts packages signed by keys that its local keyring |
50 | 50 | # trusts (see pacman-key and its man page), as well as unsigned packages. |
@@ -88,8 +88,8 @@ Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arc | ||
88 | 88 | Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch |
89 | 89 | Server = https://fascodenet.github.io/$repo/$arch/ |
90 | 90 | |
91 | -[dvzrv] | |
92 | -Server = https://pkgbuild.com/~dvzrv/repo/$arch | |
91 | +#[dvzrv] | |
92 | +#Server = https://pkgbuild.com/~dvzrv/repo/$arch | |
93 | 93 | |
94 | 94 | #[testing] |
95 | 95 | #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch |
@@ -1,6 +1,7 @@ | ||
1 | 1 | #!/usr/bin/env bash |
2 | 2 | script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && cd .. && pwd )" |
3 | 3 | tools_dir="${script_path}/tools" |
4 | +modules=() | |
4 | 5 | |
5 | 6 | _help() { |
6 | 7 | echo "usage ${0} [options]" |
@@ -12,7 +13,8 @@ _help() { | ||
12 | 13 | echo " -b | --boot-splash [bool] Set plymouth status (true or false)" |
13 | 14 | echo " -c | --channel [str] Specify the channel" |
14 | 15 | echo " -d | --developer [str] Specify the developer" |
15 | - echo " -k | --kernel [srt] Specify the kernel name" | |
16 | + echo " -k | --kernel [str] Specify the kernel name" | |
17 | + echo " -m | --module [str] Specity the module (Separated by \",\")" | |
16 | 18 | echo " -o | --os-name [str] Specify the application name" |
17 | 19 | echo " -p | --password [str] Specify the user password for livecd" |
18 | 20 | echo " -u | --username [str] Specify the user name for livecd" |
@@ -21,8 +23,8 @@ _help() { | ||
21 | 23 | } |
22 | 24 | |
23 | 25 | # Parse options |
24 | -OPTS="a:b:c:d:k:o:p:u:v:h" | |
25 | -OPTL="arch:,boot-splash:,channel:,developer:,kernel:,os-name:,password:,username:,version:,help" | |
26 | +OPTS="a:b:c:d:k:m:o:p:u:v:h" | |
27 | +OPTL="arch:,boot-splash:,channel:,developer:,kernel:,module:,os-name:,password:,username:,version:,help" | |
26 | 28 | if ! OPT="$(getopt -o "${OPTS}" -l "${OPTL}" -- "${@}")"; then |
27 | 29 | exit 1 |
28 | 30 | fi |
@@ -57,6 +59,10 @@ while true; do | ||
57 | 59 | kernel="${2}" |
58 | 60 | shift 2 |
59 | 61 | ;; |
62 | + -m | --module) | |
63 | + readarray -t -O "${#modules[@]}" modules < <(echo "${2}" | tr "," "\n") | |
64 | + shift 2 | |
65 | + ;; | |
60 | 66 | -o | --os-name) |
61 | 67 | iso_application="${2}" |
62 | 68 | shift 2 |
@@ -85,6 +91,7 @@ while true; do | ||
85 | 91 | esac |
86 | 92 | done |
87 | 93 | |
94 | +# Check values | |
88 | 95 | variable_list=( "arch" "boot_splash" "channel_name" "iso_publisher" "kernel" "iso_application" "password" "username" "iso_version") |
89 | 96 | |
90 | 97 | error=false |
@@ -109,6 +116,7 @@ echo "Live user name : ${username}" | ||
109 | 116 | echo "Live user pass : ${password}" |
110 | 117 | echo "Kernel name : ${kernel}" |
111 | 118 | echo "Kernel path : ${kernel_filename}" |
119 | +[[ "${#modules[@]}" != 0 ]] && echo "Loaded modules : ${modules[*]}" | |
112 | 120 | if [[ "${boot_splash}" = true ]]; then |
113 | 121 | echo "Plymouth : Yes" |
114 | 122 | else |
@@ -58,7 +58,8 @@ remove() { | ||
58 | 58 | _umount() { if mountpoint -q "${1}"; then umount -lf "${1}"; fi; } |
59 | 59 | |
60 | 60 | # Unmount chroot dir |
61 | -umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; } | |
61 | +#umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; } | |
62 | +umount_chroot () { "${tools_dir}/umount.sh" "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")" "$([[ "${debug}" = true ]] && printf "%s" "-d")"; } | |
62 | 63 | |
63 | 64 | # Usage: getclm <number> |
64 | 65 | # 標準入力から値を受けとり、引数で指定された列を抽出します。 |