OSDN Git Service

Merge branch 'dev' into dev-stable dev-stable origin/dev-stable osdn/dev-stable 20211201
authorhayao <hayao@fascode.net>
Wed, 1 Dec 2021 12:02:01 +0000 (21:02 +0900)
committerhayao <hayao@fascode.net>
Wed, 1 Dec 2021 12:02:01 +0000 (21:02 +0900)
137 files changed:
.shellcheckrc
Makefile
build.sh
channels/basic/architecture
channels/cinnamon/airootfs.pen4/etc/dconf/db/local.d/02-alter-cinnamon-favo-apps [new file with mode: 0644]
channels/cinnamon/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf [new file with mode: 0644]
channels/cinnamon/airootfs.pen4/etc/lightdm/slick-greeter.conf [new file with mode: 0644]
channels/cinnamon/airootfs.pen4/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json [new file with mode: 0644]
channels/cinnamon/architecture
channels/cinnamon/packages.pen4/cinnamon.pen4 [new file with mode: 0644]
channels/cinnamon/packages.pen4/exclude [new file with mode: 0644]
channels/cinnamon/packages.pen4/gtk-icon-theme.pen4 [new file with mode: 0644]
channels/cinnamon/packages_aur.pen4/gtk-icon-theme.pen4 [new file with mode: 0644]
channels/cinnamon/packages_aur.pen4/wallpapers.pen4 [new file with mode: 0644]
channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh
channels/gnome/architecture
channels/gnome/packages.pen4/exclude [new file with mode: 0644]
channels/gnome/packages.pen4/gedit.pen4 [new file with mode: 0644]
channels/gnome/packages.pen4/gnome-extensions.pen4 [new file with mode: 0644]
channels/gnome/packages.pen4/gnome.pen4 [new file with mode: 0644]
channels/gnome/packages.pen4/gtk-icon-theme.pen4 [new file with mode: 0644]
channels/gnome/packages_aur.pen4/gnome-extensions.pen4 [new file with mode: 0644]
channels/gnome/packages_aur.pen4/wallpapers.pen4 [new file with mode: 0644]
channels/lxde/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf [new file with mode: 0644]
channels/lxde/airootfs.pen4/etc/lightdm/slick-greeter.conf [new file with mode: 0644]
channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel [new file with mode: 0644]
channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel-jp [new file with mode: 0644]
channels/lxde/architecture
channels/lxde/packages.pen4/exclude [new file with mode: 0644]
channels/lxde/packages.pen4/lxde.pen4 [new file with mode: 0644]
channels/lxde/packages.pen4/screenshot.pen4 [new file with mode: 0644]
channels/lxde/packages_aur.pen4/wallpapers.pen4 [new file with mode: 0644]
channels/releng/packages.i486/exclude
channels/releng/packages.i686/exclude
channels/releng/packages.x86_64/exclude
channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/docklike-2.rc [new file with mode: 0644]
channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/whiskermenu-3.rc [new file with mode: 0644]
channels/xfce/architecture
channels/xfce/packages.pen4/exclude [new file with mode: 0644]
channels/xfce/packages.pen4/filesystem.pen4 [new file with mode: 0644]
channels/xfce/packages.pen4/gtk-icon-theme.pen4 [new file with mode: 0644]
channels/xfce/packages.pen4/xfce.pen4 [new file with mode: 0644]
channels/xfce/packages_aur.pen4/gtk-icon-theme.pen4 [new file with mode: 0644]
channels/xfce/packages_aur.pen4/other.pen4 [new file with mode: 0644]
channels/xfce/packages_aur.pen4/wallpapers.pen4 [new file with mode: 0644]
channels/xfce/packages_aur.pen4/xfce.pen4 [new file with mode: 0644]
default.conf
efiboot/nosplash/01-archiso-cd.conf [moved from efiboot/nosplash/archiso-cd.conf with 100% similarity]
efiboot/nosplash/01-archiso-usb.conf [moved from efiboot/nosplash/archiso-usb.conf with 100% similarity]
efiboot/nosplash/02-archiso-cd-rescue-safegui.conf [moved from efiboot/nosplash/archiso-cd-rescue-safegui.conf with 100% similarity]
efiboot/nosplash/02-archiso-usb-rescue-safegui.conf [moved from efiboot/nosplash/archiso-usb-rescue-safegui.conf with 100% similarity]
efiboot/nosplash/03-archiso-cd-rescue-nogui.conf [moved from efiboot/nosplash/archiso-cd-rescue-nogui.conf with 100% similarity]
efiboot/nosplash/03-archiso-usb-rescue-nogui.conf [moved from efiboot/nosplash/archiso-usb-rescue-nogui.conf with 100% similarity]
efiboot/nosplash/loader.conf
efiboot/splash/01-archiso-cd.conf [moved from efiboot/splash/archiso-cd.conf with 100% similarity]
efiboot/splash/01-archiso-usb.conf [moved from efiboot/splash/archiso-usb.conf with 100% similarity]
efiboot/splash/02-archiso-cd-nosplash.conf [moved from efiboot/splash/archiso-cd-nosplash.conf with 100% similarity]
efiboot/splash/02-archiso-usb-nosplash.conf [moved from efiboot/splash/archiso-usb-nosplash.conf with 100% similarity]
efiboot/splash/03-archiso-cd-rescue-safegui.conf [moved from efiboot/splash/archiso-cd-rescue-safegui.conf with 100% similarity]
efiboot/splash/03-archiso-usb-rescue-safegui.conf [moved from efiboot/splash/archiso-usb-rescue-safegui.conf with 100% similarity]
efiboot/splash/04-archiso-cd-rescue-nogui.conf [moved from efiboot/splash/archiso-cd-rescue-nogui.conf with 100% similarity]
efiboot/splash/04-archiso-usb-rescue-nogui.conf [moved from efiboot/splash/archiso-usb-rescue-nogui.conf with 100% similarity]
efiboot/splash/loader.conf
images/screenshot/desktop-gnome.png
modules/base/config.i686 [new file with mode: 0644]
modules/base/packages.pen4/init.pen4 [new file with mode: 0644]
modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh
modules/gdm/architecture
modules/gdm/packages.i686/gdm.i686 [moved from modules/gdm/packages.i686/gdm.x86_64 with 100% similarity]
modules/gdm/packages.pen4/gdm.pen4 [new file with mode: 0644]
modules/gdm/packages_aur.i686/plymouth/gdm.i686 [new file with mode: 0644]
modules/gdm/packages_aur.pen4/plymouth/gdm.pen4 [new file with mode: 0644]
modules/gdm/packages_aur.x86_64/plymouth/gdm.x86_64 [new file with mode: 0644]
modules/gtk-tools/architecture
modules/gtk-tools/packages.pen4/disk_management.pen4 [new file with mode: 0644]
modules/gtk-tools/packages.pen4/internet-gui.pen4 [new file with mode: 0644]
modules/gtk-tools/packages.pen4/media.pen4 [new file with mode: 0644]
modules/gtk-tools/packages.pen4/other.pen4 [new file with mode: 0644]
modules/pipewire/architecture
modules/pipewire/packages.pen4/pipewire.pen4 [new file with mode: 0644]
modules/pipewire/packages_aur.pen4/pipewire.pen4 [new file with mode: 0644]
modules/share-extra/airootfs.pen4/etc/pacman.conf [new file with mode: 0644]
modules/share-extra/architecture
modules/share-extra/packages.pen4/base.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/disk_management.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/exclude [new file with mode: 0644]
modules/share-extra/packages.pen4/filesystem.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/fonts.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/internet-gui.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/lang/ja.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/media.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/other.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/scripts.pen4 [new file with mode: 0644]
modules/share-extra/packages.pen4/xorg.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.i486/vlc.i486
modules/share-extra/packages_aur.i686/vlc.i686
modules/share-extra/packages_aur.pen4/fonts.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.pen4/lang/ja.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.pen4/medit.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.pen4/other.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.pen4/plymouth/theme.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.pen4/vlc.pen4 [new file with mode: 0644]
modules/share-extra/packages_aur.x86_64/vlc.x86_64
modules/share/airootfs.pen4/etc/systemd/system/pacman-init.service [new file with mode: 0644]
modules/share/packages.pen4/archives.pen4 [new file with mode: 0644]
modules/share/packages.pen4/base.pen4 [new file with mode: 0644]
modules/share/packages.pen4/exclude [new file with mode: 0644]
modules/share/packages.pen4/filesystem.pen4 [new file with mode: 0644]
modules/share/packages.pen4/grub.pen4 [new file with mode: 0644]
modules/share/packages.pen4/hardware.pen4 [new file with mode: 0644]
modules/share/packages.pen4/internet.pen4 [new file with mode: 0644]
modules/share/packages.pen4/kernel/core.pen4 [new file with mode: 0644]
modules/share/packages.pen4/kernel/lts.pen4 [new file with mode: 0644]
modules/share/packages.pen4/kernel/zen.pen4 [new file with mode: 0644]
modules/share/packages.pen4/memtest86/memtest86+.pen4 [new file with mode: 0644]
modules/share/packages.pen4/other.pen4 [new file with mode: 0644]
modules/share/packages.pen4/pacman.pen4 [new file with mode: 0644]
modules/share/packages_aur.i686/other.i686
modules/share/packages_aur.pen4/other.pen4 [new file with mode: 0644]
modules/share/packages_aur.pen4/plymouth/plymouth.pen4 [new file with mode: 0644]
modules/share/packages_aur.x86_64/other.x86_64
modules/zsh-powerline/architecture
modules/zsh-powerline/packages.pen4/shell.pen4 [new file with mode: 0644]
modules/zsh-powerline/packages_aur.pen4/fonts.pen4 [new file with mode: 0644]
modules/zsh-powerline/packages_aur.pen4/lsd.pen4 [new file with mode: 0644]
modules/zsh-powerline/packages_aur.pen4/powerline.pen4 [new file with mode: 0644]
system/aur.sh
system/kernel-pen4 [new file with mode: 0644]
system/locale-pen4 [new file with mode: 0644]
system/pacman-i486.conf
system/pacman-i686.conf
system/pacman-pen4.conf [new file with mode: 0644]
system/pacman-x86_64.conf
system/pkgbuild.sh
tools/docker-build.sh
tools/locale.sh

index a654c3c..acaa2e9 100644 (file)
@@ -4,4 +4,5 @@ disable=SC1091
 disable=SC2154
 disable=SC2016
 disable=SC2034
+disable=SC2294
 source-path=SCRIPTDIR
index bfd51c1..3d37b90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,41 +5,51 @@ KERNEL       := zen
 SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --noconfirm
 ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
+ARCH_Pen4    := --arch pen4
 FULLBUILD    := -d -g -e --noconfirm
 DEBUG_OPTION := --debug --log
 DEBUG        := false
 FULL_x86_64  := xfce cinnamon i3 plasma gnome
 FULL_i686    := xfce lxde
+FULL_Pen4    := xfce lxde
+
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
 ifeq (${DEBUG},true)
        ARGS += ${ARGS} ${DEBUG_OPTION}
 endif
 
-full:
+full: full-x86_64 full-i686 clean
+
+full-x86_64:
        sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
+
+full-i686:
        sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686   ${FULL_i686}
-       @make clean
-
-basic-ja-64    basic-en-64    basic-ja-32     basic-en-32    \
-cinnamon-ja-64 cinnamon-en-64 cinnamon-ja-32  cinnamon-en-32 \
-gnome-ja-64    gnome-en-64    gnome-ja-32     gnome-en-32    \
-i3-ja-64       i3-en-64       i3-ja-32        i3-en-32       \
-lxde-ja-64     lxde-en-64     lxde-ja-32      lxde-en-32     \
-plasma-ja-64   plasma-en-64                                  \
-releng-ja-64   releng-en-64   releng-ja-32    releng-en-32   \
-serene-ja-64   serene-en-64   serene-ja-32    serene-en-32   \
-xfce-ja-64     xfce-en-64     xfce-ja-32      xfce-en-32     \
-xfce-pro-ja-64 xfce-pro-en-64                                \
+
+full-pen4:
+       sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m pen4   ${FULL_Pen4}
+
+basic-ja-64    basic-en-64    basic-ja-32     basic-en-32     basic-ja-pen4     basic-en-pen4    \
+cinnamon-ja-64 cinnamon-en-64 cinnamon-ja-32  cinnamon-en-32  cinnamon-ja-pen4  cinnamon-en-pen4 \
+gnome-ja-64    gnome-en-64    gnome-ja-32     gnome-en-32     gnome-ja-pen4     gnome-en-pen4    \
+i3-ja-64       i3-en-64       i3-ja-32        i3-en-32        i3-ja-pen4        i3-en-pen4       \
+lxde-ja-64     lxde-en-64     lxde-ja-32      lxde-en-32      lxde-ja-pen4      lxde-en-pen4     \
+plasma-ja-64   plasma-en-64                                                                      \
+releng-ja-64   releng-en-64   releng-ja-32    releng-en-32    releng-ja-pen4    releng-en-pen4   \
+serene-ja-64   serene-en-64   serene-ja-32    serene-en-32    serene-ja-pen4    serene-en-pen4   \
+xfce-ja-64     xfce-en-64     xfce-ja-32      xfce-en-32      xfce-ja-pen4      xfce-en-pen4     \
+xfce-pro-ja-64 xfce-pro-en-64                                                                    \
 :
        @$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev })
        @$(eval LOCALE=${shell echo ${@} | rev | cut -d '-' -f 2 | rev })
        @$(eval CHANNEL=${shell echo ${@} | sed "s/-${LOCALE}-${ARCHITECTURE}//g"})
        @[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || :
        @case ${ARCHITECTURE} in\
-               "32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} -l ${LOCALE} ${CHANNEL} ;;\
-               "64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} -l ${LOCALE} ${CHANNEL};;\
-               *   ) echo "Unknown Architecture"; exit 1  ;; \
+               "pen4") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_Pen4}   -l ${LOCALE} ${CHANNEL} ;;\
+               "32"  ) sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686}   -l ${LOCALE} ${CHANNEL} ;;\
+               "64"  ) sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} -l ${LOCALE} ${CHANNEL};;\
+               *     ) echo "Unknown Architecture"; exit 1  ;; \
        esac
 
 menuconfig/build/mconf::
@@ -49,7 +59,7 @@ menuconfig/build/mconf::
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice menuconfig-script/channel_choice
        @menuconfig/build/mconf menuconfig-script/rootconf
 
-menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
+menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686 system/kernel-pen4
        @${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
 menuconfig-script/channel_choice:
        @${CURRENT_DIR}/tools/channel-choice-conf-gen.sh
index 037efdd..0d4f84f 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -74,6 +74,9 @@ getclm() { cut -d " " -f "${1}"; }
 # 指定されたぶんの半角空白文字を出力します
 echo_blank(){ yes " " 2> /dev/null  | head -n "${1}" | tr -d "\n"; }
 
+# cpコマンドのラッパー
+_cp(){ cp -af --no-preserve=ownership,mode -- "${@}"; }
+
 _usage () {
     cat "${script_path}/docs/build.sh/help.1"
     local blank="29" _arch _dirname _type _output _first
@@ -379,6 +382,7 @@ prepare_build() {
     for_module load_config "${module_dir}/{}/config.any" "${module_dir}/{}/config.${arch}"
     msg_debug "Loaded modules: ${modules[*]}"
     ! printf "%s\n" "${modules[@]}" | grep -x "share" >/dev/null 2>&1 && msg_warn "The share module is not loaded."
+    ! printf "%s\n" "${modules[@]}" | grep -x "base" >/dev/null 2>&1 && msg_error "The base module is not loaded." 1
 
     # Set kernel
     [[ "${customized_kernel}" = false ]] && kernel="${defaultkernel}"
@@ -424,7 +428,7 @@ prepare_build() {
         mkdir -p "$(dirname "${logging}")" && touch "${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 "${?}"
+        exit "${PIPESTATUS[0]}"
     fi
 
     # Set argument of pkglist.sh
@@ -438,7 +442,7 @@ prepare_build() {
 
     # Set argument of aur.sh and pkgbuild.sh
     [[ "${bash_debug}"   = true ]] && makepkg_script_args+=("-x")
-    [[ "${pacman_debug}" = true ]] && makepkg_script_args+=("-d")
+    [[ "${pacman_debug}" = true ]] && makepkg_script_args+=("-c")
 
     return 0
 }
@@ -502,7 +506,7 @@ make_packages_repo() {
             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"
+                msg_info "${_pkg} was not found. Install it from AUR"
                 norepopkg+=("${_pkg}")
             fi
         done
@@ -521,17 +525,23 @@ make_packages_repo() {
 make_packages_aur() {
     readarray -t _pkglist_aur < <("${tools_dir}/pkglist.sh" --aur "${pkglist_args[@]}")
     _pkglist_aur=("${_pkglist_aur[@]}" "${norepopkg[@]}")
+    _aursh_args=(
+        "-a" "${aur_helper_command}" -e "${aur_helper_package}"
+        "-d" "$(printf "%s\n" "${aur_helper_depends[@]}" | tr "\n" ",")"
+        "-p" "$(printf "%s\n" "${_pkglist_aur[@]}" | tr "\n" ",")"
+        "${makepkg_script_args[@]}" -- "${aur_helper_args[@]}"
+    )
 
     # Create a list of packages to be finally installed as packages.list directly under the working directory.
     echo -e "\n# AUR packages.\n#\n" >> "${build_dir}/packages.list"
     printf "%s\n" "${_pkglist_aur[@]}" >> "${build_dir}/packages.list"
 
-    # prepare for yay
-    cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
-    _pacstrap --asdeps --needed "go" # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない
+    # prepare for aur helper
+    _cp "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
+    _pacstrap --asdeps --needed "${aur_helper_depend[@]}"
 
     # Run aur script
-    _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}"
+    _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${_aursh_args[@]}"
 
     # Remove script
     remove "${airootfs_dir}/root/aur.sh"
@@ -548,11 +558,11 @@ make_pkgbuild() {
     mkdir -p "${airootfs_dir}/pkgbuilds/"
     for _dir in $(find "${_pkgbuild_dirs[@]}" -type f -name "PKGBUILD" -print0 2>/dev/null | xargs -0 -I{} realpath {} | xargs -I{} dirname {}); do
         msg_info "Find $(basename "${_dir}")"
-        cp -r "${_dir}" "${airootfs_dir}/pkgbuilds/"
+        _cp "${_dir}" "${airootfs_dir}/pkgbuilds/"
     done
     
     # copy buold script
-    cp -rf --preserve=mode "${script_path}/system/pkgbuild.sh" "${airootfs_dir}/root/pkgbuild.sh"
+    _cp "${script_path}/system/pkgbuild.sh" "${airootfs_dir}/root/pkgbuild.sh"
 
     # Run build script
     _run_with_pacmanconf _chroot_run "bash" "/root/pkgbuild.sh" "${makepkg_script_args[@]}" "/pkgbuilds"
@@ -574,15 +584,15 @@ make_customize_airootfs() {
     for _airootfs in "${_airootfs_list[@]}";do
         if [[ -d "${_airootfs}" ]]; then
             msg_debug "Copying airootfs ${_airootfs} ..."
-            cp -af "${_airootfs}"/* "${airootfs_dir}"
+            _cp "${_airootfs}"/* "${airootfs_dir}"
         fi
     done
 
     # Replace /etc/mkinitcpio.conf if Plymouth is enabled.
     if [[ "${boot_splash}" = true ]]; then
-        cp -f "${script_path}/mkinitcpio/mkinitcpio-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
+        install -m 0644 -- "${script_path}/mkinitcpio/mkinitcpio-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
     else
-        cp -f "${script_path}/mkinitcpio/mkinitcpio.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
+        install -m 0644 -- "${script_path}/mkinitcpio/mkinitcpio.conf" "${airootfs_dir}/etc/mkinitcpio.conf"
     fi
     
     # customize_airootfs options
@@ -646,15 +656,15 @@ make_setup_mkinitcpio() {
     mkdir -p "${airootfs_dir}/etc/initcpio/hooks" "${airootfs_dir}/etc/initcpio/install"
 
     for _hook in "archiso" "archiso_shutdown" "archiso_pxe_common" "archiso_pxe_nbd" "archiso_pxe_http" "archiso_pxe_nfs" "archiso_loop_mnt"; do
-        cp "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
-        cp "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
+        install -m 0644 -- "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
+        install -m 0644 -- "${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/script/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
-    cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
+    install -m 0644 -- "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
+    install -m 0755 -- "${script_path}/system/initcpio/script/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
+    install -m 0644 -- "${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"
 
     if [[ "${gpg_key}" ]]; then
@@ -672,8 +682,8 @@ make_setup_mkinitcpio() {
 # Prepare kernel/initramfs ${install_dir}/boot/
 make_boot() {
     mkdir -p "${isofs_dir}/${install_dir}/boot/${arch}"
-    cp "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img"
-    cp "${airootfs_dir}/boot/${kernel_filename}" "${isofs_dir}/${install_dir}/boot/${arch}/${kernel_filename}"
+    install -m 0644 --  "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img"
+    install -m 0644 --  "${airootfs_dir}/boot/${kernel_filename}" "${isofs_dir}/${install_dir}/boot/${arch}/${kernel_filename}"
 
     return 0
 }
@@ -710,7 +720,7 @@ make_syslinux() {
 
     # 一時ディレクトリに設定ファイルをコピー
     mkdir -p "${build_dir}/syslinux/"
-    cp -a "${script_path}/syslinux/"* "${build_dir}/syslinux/"
+    _cp "${script_path}/syslinux/"* "${build_dir}/syslinux/"
     [[ -d "${channel_dir}/syslinux" ]] && [[ "${customized_syslinux}" = true ]] && cp -af "${channel_dir}/syslinux"* "${build_dir}/syslinux/"
 
     # copy all syslinux config to work dir
@@ -734,8 +744,8 @@ make_syslinux() {
     done
 
     # Set syslinux wallpaper
-    cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux"
-    [[ -f "${channel_dir}/splash.png" ]] && cp -f "${channel_dir}/splash.png" "${isofs_dir}/syslinux"
+    install -m 0644 -- "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux/"
+    [[ -f "${channel_dir}/splash.png" ]] && install -m 0644 -- "${channel_dir}/splash.png" "${isofs_dir}/syslinux"
 
     # remove config
     local _remove_config
@@ -748,9 +758,9 @@ make_syslinux() {
     [[ "${memtest86}"      = false ]] && _remove_config memtest86.cfg
 
     # copy files
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux/"
 
 
     if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
@@ -786,8 +796,8 @@ make_efi() {
     install -d -m 0755 -- "${isofs_dir}/loader/entries"
     sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${isofs_dir}/loader/loader.conf"
 
-    readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-usb*.conf" -printf "%f\n" | grep -v "rescue")
-    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-usb*.conf" -printf "%f\n")
+    readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "*-archiso-usb*.conf" -printf "%f\n" | grep -v "rescue")
+    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "*-archiso-usb*.conf" -printf "%f\n")
 
     for _efi_config in "${_efi_config_list[@]}"; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
@@ -825,26 +835,26 @@ make_efiboot() {
     mount "${build_dir}/efiboot.img" "${build_dir}/efiboot"
 
     mkdir -p "${build_dir}/efiboot/EFI/alteriso/${arch}" "${build_dir}/efiboot/EFI/boot" "${build_dir}/efiboot/loader/entries"
-    cp "${isofs_dir}/${install_dir}/boot/${arch}/${kernel_filename}" "${build_dir}/efiboot/EFI/alteriso/${arch}/${kernel_filename}.efi"
-    cp "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${build_dir}/efiboot/EFI/alteriso/${arch}/archiso.img"
+    _cp "${isofs_dir}/${install_dir}/boot/${arch}/${kernel_filename}" "${build_dir}/efiboot/EFI/alteriso/${arch}/${kernel_filename}.efi"
+    _cp "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${build_dir}/efiboot/EFI/alteriso/${arch}/archiso.img"
 
     local _ucode_image _efi_config _use_config_name="nosplash" _bootfile
     for _ucode_image in "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}; do
-        [[ -e "${_ucode_image}" ]] && cp "${_ucode_image}" "${build_dir}/efiboot/EFI/alteriso/"
+        [[ -e "${_ucode_image}" ]] && _cp "${_ucode_image}" "${build_dir}/efiboot/EFI/alteriso/"
     done
 
-    cp "${airootfs_dir}/usr/share/efitools/efi/HashTool.efi" "${build_dir}/efiboot/EFI/boot/"
+    _cp "${airootfs_dir}/usr/share/efitools/efi/HashTool.efi" "${build_dir}/efiboot/EFI/boot/"
 
     _bootfile="$(basename "$(ls "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-boot"*".efi" )")"
-    cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${build_dir}/efiboot/EFI/boot/${_bootfile#systemd-}"
+    _cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${_bootfile}" "${build_dir}/efiboot/EFI/boot/${_bootfile#systemd-}"
 
     [[ "${boot_splash}" = true ]] && _use_config_name="splash"
     sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${build_dir}/efiboot/loader/loader.conf"
 
     find "${isofs_dir}/loader/entries/" -maxdepth 1 -mindepth 1 -name "uefi-shell*" -type f -printf "%p\0" | xargs -0 -I{} cp {} "${build_dir}/efiboot/loader/entries/"
 
-    readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "archiso-cd*.conf" -printf "%f\n" | grep -v "rescue")
-    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "archiso-cd*.conf" -printf "%f\n")
+    readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f -name "*-archiso-cd*.conf" -printf "%f\n" | grep -v "rescue")
+    [[ "${norescue_entry}" = false ]] && readarray -t _efi_config_list < <(find "${script_path}/efiboot/${_use_config_name}/" -mindepth 1 -maxdepth 1 -type f  -name "*-archiso-cd*.conf" -printf "%f\n")
 
     for _efi_config in "${_efi_config_list[@]}"; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
diff --git a/channels/cinnamon/airootfs.pen4/etc/dconf/db/local.d/02-alter-cinnamon-favo-apps b/channels/cinnamon/airootfs.pen4/etc/dconf/db/local.d/02-alter-cinnamon-favo-apps
new file mode 100644 (file)
index 0000000..dcce41b
--- /dev/null
@@ -0,0 +1,2 @@
+[org/cinnamon]
+favorite-apps=['firefox.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']
diff --git a/channels/cinnamon/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf b/channels/cinnamon/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf
new file mode 100644 (file)
index 0000000..18fca9a
--- /dev/null
@@ -0,0 +1,2 @@
+[Seat:*]
+greeter-session=lightdm-slick-greeter
diff --git a/channels/cinnamon/airootfs.pen4/etc/lightdm/slick-greeter.conf b/channels/cinnamon/airootfs.pen4/etc/lightdm/slick-greeter.conf
new file mode 100644 (file)
index 0000000..8d8fab6
--- /dev/null
@@ -0,0 +1,5 @@
+[Greeter]
+draw-user-backgrounds=false
+background=/usr/share/backgrounds/alter-nochr.png
+theme-name=Arc-Dark
+icon-theme-name=Inverse-blue-dark
diff --git a/channels/cinnamon/airootfs.pen4/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json b/channels/cinnamon/airootfs.pen4/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json
new file mode 100644 (file)
index 0000000..80b3aad
--- /dev/null
@@ -0,0 +1,370 @@
+{
+    "layout": {
+        "type": "layout",
+        "pages": [
+            "generalPage",
+            "panelPage",
+            "thumbnailsPage",
+            "contextMenuPage"
+        ],
+        "generalPage": {
+            "type": "page",
+            "title": "General",
+            "sections": [
+                "generalSection",
+                "hotKeysSection"
+            ]
+        },
+        "panelPage": {
+            "type": "page",
+            "title": "Panel",
+            "sections": [
+                "appButtonsSection"
+            ]
+        },
+        "thumbnailsPage": {
+            "type": "page",
+            "title": "Thumbnails",
+            "sections": [
+                "thumbnailsSection",
+                "hoverPeekSection"
+            ]
+        },
+        "contextMenuPage": {
+            "type": "page",
+            "title": "Context Menu",
+            "sections": [
+                "contextMenuSection"
+            ]
+        },
+        "generalSection": {
+            "type": "section",
+            "title": "Behavior",
+            "keys": [
+                "group-apps",
+                "scroll-behavior",
+                "left-click-action",
+                "middle-click-action",
+                "show-all-workspaces"
+            ]
+        },
+        "appButtonsSection": {
+            "type": "section",
+            "title": "Application Buttons",
+            "keys": [
+                "title-display",
+                "launcher-animation-effect",
+                "number-display",
+                "pinned-apps",
+                "enable-app-button-dragging"
+            ]
+        },
+        "hotKeysSection": {
+            "type": "section",
+            "title": "Hot Keys",
+            "keys": [
+                "cycleMenusHotkey",
+                "show-apps-order-hotkey",
+                "show-apps-order-timeout",
+                "super-num-hotkeys"
+            ]
+        },
+        "thumbnailsSection": {
+            "type": "section",
+            "title": "Thumbnails",
+            "keys": [
+                "thumbnail-scroll-behavior",
+                "show-thumbnails",
+                "animate-thumbnails",
+                "vertical-thumbnails",
+                "sort-thumbnails",
+                "highlight-last-focused-thumbnail",
+                "onclick-thumbnails",
+                "thumbnail-timeout",
+                "thumbnail-size"
+            ]
+        },
+        "hoverPeekSection": {
+            "type": "section",
+            "title": "Hover Peek",
+            "keys": [
+                "enable-hover-peek",
+                "hover-peek-time-in",
+                "hover-peek-time-out",
+                "hover-peek-opacity"
+            ]
+        },
+        "contextMenuSection": {
+            "type": "section",
+            "title": "",
+            "keys": [
+                "show-recent",
+                "autostart-menu-item",
+                "launch-new-instance-menu-item",
+                "monitor-move-all-windows"
+            ]
+        }
+    },
+    "number-display": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Show window count numbers",
+        "value": true
+    },
+    "title-display": {
+        "type": "combobox",
+        "default": 1,
+        "description": "Button label",
+        "options": {
+            "None": 1,
+            "Application name": 2,
+            "Window title": 3,
+            "Window title (only for the focused window)": 4
+        },
+        "value": 1
+    },
+    "scroll-behavior": {
+        "type": "combobox",
+        "default": 1,
+        "description": "Mouse wheel scroll action",
+        "options": {
+            "None": 1,
+            "Cycle apps": 2,
+            "Cycle windows": 3
+        },
+        "value": 1
+    },
+    "left-click-action": {
+        "type": "combobox",
+        "default": 2,
+        "description": "Left click action",
+        "options": {
+            "None": 1,
+            "Toggle activation of last focused window": 2,
+            "Cycle windows": 3
+        },
+        "value": 2
+    },
+    "middle-click-action": {
+        "type": "combobox",
+        "default": 3,
+        "description": "Middle click action",
+        "options": {
+            "None": 1,
+            "Launch new app instance": 2,
+            "Close last focused window in group": 3
+        },
+        "value": 3
+    },
+    "pinned-apps": {
+        "type": "generic",
+        "default": [
+            "firefox.desktop",
+            "nemo.desktop",
+            "org.gnome.Terminal.desktop",
+            "thunderbird.desktop",
+            "gnome-system-monitor.desktop",
+            "cinnamon-settings.desktop"
+        ],
+        "value": [
+            "firefox.desktop",
+            "nemo.desktop",
+            "org.gnome.Terminal.desktop",
+            "thunderbird.desktop",
+            "gnome-system-monitor.desktop",
+            "cinnamon-settings.desktop"
+        ]
+    },
+    "group-apps": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Group windows by application",
+        "value": true
+    },
+    "show-all-workspaces": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Show windows from all workspaces",
+        "value": false
+    },
+    "enable-app-button-dragging": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Enable app button dragging",
+        "value": true
+    },
+    "launcher-animation-effect": {
+        "type": "combobox",
+        "default": 3,
+        "description": "Launcher animation",
+        "options": {
+            "None": 1,
+            "Fade": 2,
+            "Scale": 3
+        },
+        "value": 3
+    },
+    "cycleMenusHotkey": {
+        "type": "keybinding",
+        "default": "<Super>space",
+        "description": "Global hotkey for cycling through thumbnail menus",
+        "value": "<Super>space"
+    },
+    "show-apps-order-hotkey": {
+        "type": "keybinding",
+        "default": "<Super>grave",
+        "description": "Global hotkey to show the order of apps",
+        "value": "<Super>grave"
+    },
+    "show-apps-order-timeout": {
+        "type": "spinbutton",
+        "default": 2500,
+        "min": 100,
+        "max": 10000,
+        "step": 10,
+        "units": "milliseconds",
+        "description": "Duration of the apps order display on hotkey press",
+        "value": 2500
+    },
+    "super-num-hotkeys": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Enable Super+<number> shortcut to switch/open apps",
+        "value": true
+    },
+    "thumbnail-timeout": {
+        "dependency": "!onclick-thumbnails",
+        "type": "combobox",
+        "default": 250,
+        "description": "Delay before showing thumbnails",
+        "options": {
+            "50 ms": 50,
+            "250 ms": 250,
+            "500 ms": 500
+        },
+        "value": 250
+    },
+    "thumbnail-size": {
+        "type": "combobox",
+        "default": 6,
+        "description": "Thumbnail size",
+        "options": {
+            "Small": 3,
+            "Medium": 6,
+            "Large": 9,
+            "Largest": 12
+        },
+        "value": 6
+    },
+    "thumbnail-scroll-behavior": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Cycle windows on mouse wheel scroll",
+        "value": false
+    },
+    "show-thumbnails": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Show thumbnails",
+        "value": true
+    },
+    "animate-thumbnails": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Animate thumbnails",
+        "value": false
+    },
+    "vertical-thumbnails": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Enable vertical thumbnails",
+        "value": false
+    },
+    "sort-thumbnails": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Sort thumbnails according to the last focused windows",
+        "value": false
+    },
+    "highlight-last-focused-thumbnail": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Highlight the thumbnail of the last focused window",
+        "value": true
+    },
+    "onclick-thumbnails": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Click to show thumbnails",
+        "value": false
+    },
+    "show-recent": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Show recent items",
+        "value": true
+    },
+    "autostart-menu-item": {
+        "type": "checkbox",
+        "default": false,
+        "description": "Show autostart option",
+        "value": false
+    },
+    "launch-new-instance-menu-item": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Show new window option",
+        "tooltip": "Shows the \"New Window\" option in an app's context menu if it doesn't already have one from the app's own action menu items.",
+        "value": true
+    },
+    "monitor-move-all-windows": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Apply the monitor move option to all windows",
+        "tooltip": "When clicking \"Move to monitor\" in the context menu, this option will move all of an app's windows instead of just the last focused window from the app.",
+        "value": true
+    },
+    "enable-hover-peek": {
+        "type": "checkbox",
+        "default": true,
+        "description": "Show the window when hovering its thumbnail",
+        "value": true
+    },
+    "hover-peek-time-in": {
+        "dependency": "enable-hover-peek",
+        "type": "combobox",
+        "default": 300,
+        "description": "Window fade-in time",
+        "options": {
+            "150 ms": 150,
+            "300 ms": 300,
+            "450 ms": 450
+        },
+        "value": 300
+    },
+    "hover-peek-time-out": {
+        "dependency": "enable-hover-peek",
+        "type": "combobox",
+        "default": 0,
+        "description": "Window fade-out time",
+        "options": {
+            "None": 0,
+            "150 ms": 150,
+            "300 ms": 300,
+            "450 ms": 450
+        },
+        "value": 0
+    },
+    "hover-peek-opacity": {
+        "dependency": "enable-hover-peek",
+        "type": "spinbutton",
+        "default": 100,
+        "min": 0,
+        "max": 100,
+        "step": 1,
+        "units": "percent",
+        "description": "Window opacity",
+        "value": 100
+    },
+    "__md5__": "a8bd266f01474817e50162d841192d67"
+}
diff --git a/channels/cinnamon/packages.pen4/cinnamon.pen4 b/channels/cinnamon/packages.pen4/cinnamon.pen4
new file mode 100644 (file)
index 0000000..69cbf48
--- /dev/null
@@ -0,0 +1,19 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Cinnamon Desktop Environment
+
+
+#-- Cinnamon --#
+cinnamon
+cinnamon-translations
+
+#-- Tools --#
+dconf-editor
+gnome-terminal
diff --git a/channels/cinnamon/packages.pen4/exclude b/channels/cinnamon/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/channels/cinnamon/packages.pen4/gtk-icon-theme.pen4 b/channels/cinnamon/packages.pen4/gtk-icon-theme.pen4
new file mode 100644 (file)
index 0000000..93887cc
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# theme
+arc-gtk-theme
diff --git a/channels/cinnamon/packages_aur.pen4/gtk-icon-theme.pen4 b/channels/cinnamon/packages_aur.pen4/gtk-icon-theme.pen4
new file mode 100644 (file)
index 0000000..b388ce3
--- /dev/null
@@ -0,0 +1,16 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# icon
+inverse-icon-theme-blue-git
+
+#-- panel theme --#
+adara-theme-git
diff --git a/channels/cinnamon/packages_aur.pen4/wallpapers.pen4 b/channels/cinnamon/packages_aur.pen4/wallpapers.pen4
new file mode 100644 (file)
index 0000000..67eb9b0
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- wallpaper --#
+alterlinux-wallpapers
index 632b16a..cc343ff 100644 (file)
@@ -88,6 +88,7 @@ menu-height=550
 menu-hotkey='Super_L'
 menu-layout='Windows'
 menu-width=290
+multi-monitor=true
 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']
 prefs-visible-page=0
 right-panel-width=205
index e1c5b26..db51d75 100755 (executable)
@@ -29,7 +29,8 @@ remove_userfile "Desktop/calamares.desktop"
 
 # Optimize for i686
 if [[ "${arch}" = "i686" ]]; then
-    for _file in "/etc/dconf/db/local.d/01-alter-gnome" "/etc/dconf/db/local.d/02-live-installer-panel"; do
+    # shellcheck disable=SC2043
+    for _file in "/etc/dconf/db/local.d/01-alter-gnome"; do
         sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}"
     done
 fi
diff --git a/channels/gnome/packages.pen4/exclude b/channels/gnome/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..3400aad
--- /dev/null
@@ -0,0 +1,3 @@
+xf86-input-synaptics
+alterlinux-medit-themes
+medit
diff --git a/channels/gnome/packages.pen4/gedit.pen4 b/channels/gnome/packages.pen4/gedit.pen4
new file mode 100644 (file)
index 0000000..6b164e1
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+gedit
diff --git a/channels/gnome/packages.pen4/gnome-extensions.pen4 b/channels/gnome/packages.pen4/gnome-extensions.pen4
new file mode 100644 (file)
index 0000000..0348831
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome extensions
+
+gnome-shell-extension-appindicator
diff --git a/channels/gnome/packages.pen4/gnome.pen4 b/channels/gnome/packages.pen4/gnome.pen4
new file mode 100644 (file)
index 0000000..d43932e
--- /dev/null
@@ -0,0 +1,58 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome
+
+
+#-- gnome --#
+gnome-backgrounds
+gnome-boxes
+gnome-calculator
+gnome-calendar
+gnome-control-center
+gnome-common
+gnome-desktop
+gnome-disk-utility
+gnome-keyring
+gnome-logs
+gnome-menus
+gnome-remote-desktop
+gnome-screenshot
+gnome-session
+gnome-settings-daemon
+gnome-shell
+gnome-shell-extensions
+gnome-system-monitor
+gnome-terminal
+mutter
+nautilus
+sushi
+
+
+#-- gnome-extra --#
+dconf-editor
+gnome-tweaks
+
+
+#-- Display manager --#
+gdm
+
+#-- other --#
+gnome-bluetooth
+gnome-epub-thumbnailer
+
+#aur build
+meson
+ninja
+jq
+oniguruma
+
+# libinput
+xf86-input-libinput
+
diff --git a/channels/gnome/packages.pen4/gtk-icon-theme.pen4 b/channels/gnome/packages.pen4/gtk-icon-theme.pen4
new file mode 100644 (file)
index 0000000..12d9ce7
--- /dev/null
@@ -0,0 +1,16 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# icon
+papirus-icon-theme
+
+# theme
+materia-gtk-theme
diff --git a/channels/gnome/packages_aur.pen4/gnome-extensions.pen4 b/channels/gnome/packages_aur.pen4/gnome-extensions.pen4
new file mode 100644 (file)
index 0000000..104d065
--- /dev/null
@@ -0,0 +1,19 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome extensions
+
+chrome-gnome-shell
+
+gnome-shell-extension-arc-menu
+gnome-shell-extension-clipboard-indicator
+gnome-shell-extension-coverflow-alt-tab
+gnome-shell-extension-dash-to-panel
+gnome-shell-extension-desktop-icons-ng
+gnome-shell-extension-extensions
diff --git a/channels/gnome/packages_aur.pen4/wallpapers.pen4 b/channels/gnome/packages_aur.pen4/wallpapers.pen4
new file mode 100644 (file)
index 0000000..67eb9b0
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- wallpaper --#
+alterlinux-wallpapers
diff --git a/channels/lxde/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf b/channels/lxde/airootfs.pen4/etc/lightdm/lightdm.conf.d/01-slick-greeter.conf
new file mode 100644 (file)
index 0000000..18fca9a
--- /dev/null
@@ -0,0 +1,2 @@
+[Seat:*]
+greeter-session=lightdm-slick-greeter
diff --git a/channels/lxde/airootfs.pen4/etc/lightdm/slick-greeter.conf b/channels/lxde/airootfs.pen4/etc/lightdm/slick-greeter.conf
new file mode 100644 (file)
index 0000000..6a4e431
--- /dev/null
@@ -0,0 +1,5 @@
+[Greeter]
+draw-user-backgrounds=false
+background=/usr/share/backgrounds/alter-nochr.png
+theme-name=Adapta-Nokto-Eta
+icon-theme-name=Papirus-Dark
diff --git a/channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel b/channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel
new file mode 100644 (file)
index 0000000..5cf4441
--- /dev/null
@@ -0,0 +1,140 @@
+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
+
+Global {
+  edge=bottom
+  align=left
+  margin=0
+  widthtype=percent
+  width=100
+  height=34
+  transparent=0
+  tintcolor=#000000
+  alpha=0
+  setdocktype=1
+  setpartialstrut=1
+  autohide=0
+  heightwhenhidden=0
+  usefontcolor=0
+  fontcolor=#ffffff
+  background=0
+  backgroundfile=/usr/share/lxpanel/images/background.png
+  iconsize=27
+}
+Plugin {
+  type=space
+  Config {
+    Size=5
+  }
+}
+Plugin {
+  type=menu
+  Config {
+    image=/usr/share/icons/hicolor/36x36/apps/alter.png
+    system {
+    }
+    separator {
+    }
+    item {
+      command=run
+    }
+    separator {
+    }
+    item {
+      image=gnome-logout
+      command=logout
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=7
+  }
+}
+Plugin {
+  type=launchbar
+  Config {
+    Button {
+      id=firefox.desktop
+    }
+    Button {
+      id=pcmanfm.desktop
+    }
+    Button {
+      id=lxterminal.desktop
+    }
+    Button {
+      id=lxtask.desktop
+    }
+    Button {
+      id=org.gnome.Screenshot.desktop
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=20
+  }
+}
+Plugin {
+  type=taskbar
+  expand=1
+  Config {
+    tooltips=-1
+    IconsOnly=-1
+    AcceptSkipPager=1
+    ShowIconified=1
+    ShowMapped=1
+    ShowAllDesks=0
+    UseMouseWheel=0
+    UseUrgencyHint=1
+    FlatButton=-1
+    MaxTaskWidth=50
+    spacing=1
+    SameMonitorOnly=-1
+    GroupedTasks=0
+  }
+}
+Plugin {
+  type=pager
+  Config {
+  }
+}
+Plugin {
+  type=xkb
+  Config {
+    Model=pc105
+    LayoutsList=us
+    VariantsList=,
+    ToggleOpt=grp:shift_caps_toggle
+    DisplayType=0
+    KeepSysLayouts=0
+    NoResetOpt=0
+    FlagSize=1
+  }
+}
+Plugin {
+  type=volume
+  Config {
+    VolumeMuteKey=XF86AudioMute
+    VolumeDownKey=XF86AudioLowerVolume
+    VolumeUpKey=XF86AudioRaiseVolume
+  }
+}
+Plugin {
+  type=tray
+  Config {
+  }
+}
+Plugin {
+  type=dclock
+  Config {
+    ClockFmt=%R
+    TooltipFmt=%A %x
+    BoldFont=0
+    IconOnly=0
+    CenterText=0
+  }
+}
diff --git a/channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel-jp b/channels/lxde/airootfs.pen4/etc/skel/.config/lxpanel/LXDE/panels/panel-jp
new file mode 100644 (file)
index 0000000..b43af44
--- /dev/null
@@ -0,0 +1,127 @@
+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
+
+Global {
+  edge=bottom
+  align=left
+  margin=0
+  widthtype=percent
+  width=100
+  height=34
+  transparent=0
+  tintcolor=#000000
+  alpha=0
+  setdocktype=1
+  setpartialstrut=1
+  autohide=0
+  heightwhenhidden=0
+  usefontcolor=0
+  fontcolor=#ffffff
+  background=0
+  backgroundfile=/usr/share/lxpanel/images/background.png
+  iconsize=27
+}
+Plugin {
+  type=space
+  Config {
+    Size=5
+  }
+}
+Plugin {
+  type=menu
+  Config {
+    image=/usr/share/icons/hicolor/36x36/apps/alter.png
+    system {
+    }
+    separator {
+    }
+    item {
+      command=run
+    }
+    separator {
+    }
+    item {
+      image=gnome-logout
+      command=logout
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=7
+  }
+}
+Plugin {
+  type=launchbar
+  Config {
+    Button {
+      id=firefox.desktop
+    }
+    Button {
+      id=pcmanfm.desktop
+    }
+    Button {
+      id=lxterminal.desktop
+    }
+    Button {
+      id=lxtask.desktop
+    }
+    Button {
+      id=org.gnome.Screenshot.desktop
+    }
+  }
+}
+Plugin {
+  type=space
+  Config {
+    Size=20
+  }
+}
+Plugin {
+  type=taskbar
+  expand=1
+  Config {
+    tooltips=-1
+    IconsOnly=-1
+    AcceptSkipPager=1
+    ShowIconified=1
+    ShowMapped=1
+    ShowAllDesks=0
+    UseMouseWheel=0
+    UseUrgencyHint=1
+    FlatButton=-1
+    MaxTaskWidth=50
+    spacing=1
+    SameMonitorOnly=-1
+    GroupedTasks=0
+  }
+}
+Plugin {
+  type=pager
+  Config {
+  }
+}
+Plugin {
+  type=volume
+  Config {
+    VolumeMuteKey=XF86AudioMute
+    VolumeDownKey=XF86AudioLowerVolume
+    VolumeUpKey=XF86AudioRaiseVolume
+  }
+}
+Plugin {
+  type=tray
+  Config {
+  }
+}
+Plugin {
+  type=dclock
+  Config {
+    ClockFmt=%R
+    TooltipFmt=%A %x
+    BoldFont=0
+    IconOnly=0
+    CenterText=0
+  }
+}
diff --git a/channels/lxde/packages.pen4/exclude b/channels/lxde/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/channels/lxde/packages.pen4/lxde.pen4 b/channels/lxde/packages.pen4/lxde.pen4
new file mode 100644 (file)
index 0000000..39ad4f5
--- /dev/null
@@ -0,0 +1,39 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Lxde Desktop Environment
+
+
+#-- lxde base --#
+# gpicview
+lxappearance
+lxappearance-obconf
+lxde-common
+lxde-icon-theme
+# lxdm     LightDMで代用
+lxhotkey
+lxinput
+lxlauncher
+# lxmusic  VLCがインストールされているため(Issues #51)
+lxpanel
+lxrandr
+lxsession
+lxtask
+lxterminal
+openbox
+pcmanfm
+
+
+#-- themes --#
+adapta-gtk-theme
+papirus-icon-theme
+
+
+#-- To run fascode-live-tools on lxde session --#
+python-pyxdg
diff --git a/channels/lxde/packages.pen4/screenshot.pen4 b/channels/lxde/packages.pen4/screenshot.pen4
new file mode 100644 (file)
index 0000000..7dd8248
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+gnome-screenshot
diff --git a/channels/lxde/packages_aur.pen4/wallpapers.pen4 b/channels/lxde/packages_aur.pen4/wallpapers.pen4
new file mode 100644 (file)
index 0000000..67eb9b0
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- wallpaper --#
+alterlinux-wallpapers
index 8ba3e32..8d3a41c 100644 (file)
@@ -28,6 +28,7 @@ unzip-iconv
 xdg-user-dirs
 xz
 yay
+paru
 zip
 zstd
 
index 098b470..c4cce72 100644 (file)
@@ -29,5 +29,6 @@ unzip-iconv
 xdg-user-dirs
 xz
 yay
+paru
 zip
 zstd
diff --git a/channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/docklike-2.rc b/channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/docklike-2.rc
new file mode 100644 (file)
index 0000000..4a4aeb7
--- /dev/null
@@ -0,0 +1,5 @@
+[user]
+pinned=/usr/share/applications/firefox.desktop;/usr/share/applications/thunar.desktop;/usr/share/applications/thunderbird.desktop;/usr/share/applications/vlc.desktop;/usr/share/applications/medit.desktop;/usr/share/applications/xfce4-screenshooter.desktop;/usr/share/applications/xfce4-terminal.desktop;/usr/share/applications/xfce-settings-manager.desktop;
+indicatorStyle=1
+forceIconSize=false
+iconSize=32
diff --git a/channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/whiskermenu-3.rc b/channels/xfce/airootfs.pen4/etc/skel/.config/xfce4/panel/whiskermenu-3.rc
new file mode 100644 (file)
index 0000000..af23922
--- /dev/null
@@ -0,0 +1,80 @@
+favorites=firefox.desktop,thunderbird.desktop,vlc.desktop,xfce4-screenshooter.desktop
+recent=
+button-title=Alter
+button-icon=/usr/share/icons/hicolor/96x96/apps/alter.png
+button-single-row=false
+show-button-title=true
+show-button-icon=true
+launcher-show-name=true
+launcher-show-description=true
+launcher-show-tooltip=true
+item-icon-size=2
+hover-switch-category=false
+category-show-name=true
+category-icon-size=1
+load-hierarchy=false
+view-as-icons=true
+recent-items-max=0
+favorites-in-recent=true
+display-recent-default=false
+position-search-alternate=true
+position-commands-alternate=false
+position-categories-alternate=false
+stay-on-focus-out=false
+confirm-session-command=true
+menu-width=509
+menu-height=521
+menu-opacity=100
+command-settings=xfce4-settings-manager
+show-command-settings=true
+command-lockscreen=xflock4
+show-command-lockscreen=false
+command-switchuser=gdmflexiserver
+show-command-switchuser=true
+command-logoutuser=xfce4-session-logout --logout --fast
+show-command-logoutuser=false
+command-restart=xfce4-session-logout --reboot --fast
+show-command-restart=false
+command-shutdown=xfce4-session-logout --halt --fast
+show-command-shutdown=false
+command-suspend=xfce4-session-logout --suspend
+show-command-suspend=false
+command-hibernate=xfce4-session-logout --hibernate
+show-command-hibernate=false
+command-logout=xfce4-session-logout
+show-command-logout=true
+command-menueditor=menulibre
+show-command-menueditor=false
+command-profile=mugshot
+show-command-profile=false
+search-actions=5
+
+[action0]
+name=Man Pages
+pattern=#
+command=exo-open --launch TerminalEmulator man %s
+regex=false
+
+[action1]
+name=Web Search
+pattern=?
+command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
+regex=false
+
+[action2]
+name=Wikipedia
+pattern=!w
+command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
+regex=false
+
+[action3]
+name=Run in Terminal
+pattern=!
+command=exo-open --launch TerminalEmulator %s
+regex=false
+
+[action4]
+name=Open URI
+pattern=^(file|http|https):\\/\\/(.*)$
+command=exo-open \\0
+regex=true
diff --git a/channels/xfce/packages.pen4/exclude b/channels/xfce/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/channels/xfce/packages.pen4/filesystem.pen4 b/channels/xfce/packages.pen4/filesystem.pen4
new file mode 100644 (file)
index 0000000..3ea44e4
--- /dev/null
@@ -0,0 +1,15 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# File System
+
+
+#-- mtp --#
+gvfs-mtp
+mtpfs
diff --git a/channels/xfce/packages.pen4/gtk-icon-theme.pen4 b/channels/xfce/packages.pen4/gtk-icon-theme.pen4
new file mode 100644 (file)
index 0000000..93887cc
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# theme
+arc-gtk-theme
diff --git a/channels/xfce/packages.pen4/xfce.pen4 b/channels/xfce/packages.pen4/xfce.pen4
new file mode 100644 (file)
index 0000000..64b7493
--- /dev/null
@@ -0,0 +1,39 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Xfce4 Desktop Environment
+
+
+#-- xfce4 base --#
+exo
+garcon
+gnome-keyring
+thunar
+thunar-volman
+tumbler
+xfce4-appfinder
+xfce4-notifyd
+xfce4-screenshooter
+xfce4-session
+xfce4-settings
+xfce4-terminal
+xfce4-panel
+xfce4-power-manager
+xfconf
+xfdesktop
+xfwm4
+xfwm4-themes
+
+
+#-- xfce4 plugins --#
+thunar-archive-plugin
+thunar-media-tags-plugin
+xfce4-clipman-plugin
+xfce4-pulseaudio-plugin
+xfce4-whiskermenu-plugin
diff --git a/channels/xfce/packages_aur.pen4/gtk-icon-theme.pen4 b/channels/xfce/packages_aur.pen4/gtk-icon-theme.pen4
new file mode 100644 (file)
index 0000000..9e2e6c4
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# icon
+inverse-icon-theme-blue-git
+
diff --git a/channels/xfce/packages_aur.pen4/other.pen4 b/channels/xfce/packages_aur.pen4/other.pen4
new file mode 100644 (file)
index 0000000..828e4c3
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- other --#
+ipad_charge-git
+tlpui
diff --git a/channels/xfce/packages_aur.pen4/wallpapers.pen4 b/channels/xfce/packages_aur.pen4/wallpapers.pen4
new file mode 100644 (file)
index 0000000..67eb9b0
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- wallpaper --#
+alterlinux-wallpapers
diff --git a/channels/xfce/packages_aur.pen4/xfce.pen4 b/channels/xfce/packages_aur.pen4/xfce.pen4
new file mode 100644 (file)
index 0000000..68cd05c
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#xfce4-calculator-plugin
+xfce4-docklike-plugin
index 9c56fe7..c291eed 100644 (file)
@@ -133,6 +133,23 @@ norescue_entry=false
 # Use this array only in the configuration files in the channel.
 #modules=("share")
 
+# AUR Helper config
+aur_helper_command="yay"
+aur_helper_package="yay"
+aur_helper_depends=("go")
+aur_helper_args=(
+    --useask
+    --mflags "-AcC"
+    --mflags "--skippgpcheck"
+    --aur
+    --nocleanmenu
+    --nodiffmenu
+    --noeditmenu
+    --noupgrademenu
+    --noprovides
+    --removemake
+)
+
 #-- kernel config --#
 # Set the kernel that live session use.
 # Please don't set anything if you want to use normal kernel.
index 247728b..f4f5f04 100644 (file)
@@ -1,2 +1,2 @@
 timeout 5
-default archiso-%ARCH%.conf
+default 01-archiso-%ARCH%.conf
index 247728b..f4f5f04 100644 (file)
@@ -1,2 +1,2 @@
 timeout 5
-default archiso-%ARCH%.conf
+default 01-archiso-%ARCH%.conf
index 4764159..4a99122 100644 (file)
Binary files a/images/screenshot/desktop-gnome.png and b/images/screenshot/desktop-gnome.png differ
diff --git a/modules/base/config.i686 b/modules/base/config.i686
new file mode 100644 (file)
index 0000000..671a98f
--- /dev/null
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Config files for all i686 channel
+#
+
+
+#-- Use trizen --#
+
+#aur_helper_command="trizen"
+#aur_helper_package="trizen"
+#aur_helper_depends=(
+#    'git'
+#    'pacutils'
+#    'perl'
+#    'perl-libwww'
+#    'perl-term-ui'
+#    'pacman'
+#   'perl-json'
+#   'perl-data-dump'
+#    'perl-lwp-protocol-https'
+#   'perl-term-readline-gnu'
+#   'highlight'
+#)
+#aur_helper_args=(
+#    #--mflags "-AcC,--skippgpcheck"
+#    --aur
+#    --noedit
+#)
+
+#-- Use wfa --#
+#aur_helper_package="wfa-git"
+#aur_helper_command="wfa"
+#aur_helper_depends=('sudo' 'pacman' 'jq' 'python3' 'curl' 'pyalpm' 'python-srcinfo')
+#aur_helper_args=(
+#    --mflags "-AcC"
+#    --mflags "--skippgpcheck"
+#    --aur
+#)
+
+#-- Use pikaur --#
+#aur_helper_package="pikaur"
+#aur_helper_command="pikaur"
+#aur_helper_depends=("pyalpm" "asp" "python-commonmark")
+#aur_helper_args=(
+#    --aur
+#    --noedit
+#    --noconfirm
+#    --nodiff
+#    --rebuild
+#    --mflags="-AcC,--skippgpcheck"
+#)
+
+#-- Use paru --#
+aur_helper_package="paru"
+aur_helper_command="paru"
+aur_helper_depends=("cargo" "asp" "bat")
+aur_helper_args=(
+    --useask
+    --mflags "-AcC"
+    --mflags "--skippgpcheck"
+    --aur
+#    --nocleanmenu
+#    --nodiffmenu
+    --skipreview
+#    --noeditmenu
+    --noupgrademenu
+    --removemake
+)
diff --git a/modules/base/packages.pen4/init.pen4 b/modules/base/packages.pen4/init.pen4
new file mode 100644 (file)
index 0000000..3471145
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Base packages
+
+base
+syslinux
index baf29e6..6a856af 100755 (executable)
@@ -8,11 +8,11 @@
 #
 
 # Enable gdm to auto login
-if [[ "${boot_splash}" =  true ]]; then
-    _safe_systemctl enable gdm-plymouth.service
-else
+#if [[ "${boot_splash}" =  true ]]; then
+#    _safe_systemctl enable gdm-plymouth.service
+#else
     _safe_systemctl enable gdm.service
-fi
+#fi
 
 
 # Replace auto login user
index 84d09d3..471582f 100644 (file)
@@ -8,3 +8,5 @@
 # Supported architecture list
 
 x86_64
+i686
+pen4
diff --git a/modules/gdm/packages.pen4/gdm.pen4 b/modules/gdm/packages.pen4/gdm.pen4
new file mode 100644 (file)
index 0000000..0daa2c9
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# GDM
+
+gdm
diff --git a/modules/gdm/packages_aur.i686/plymouth/gdm.i686 b/modules/gdm/packages_aur.i686/plymouth/gdm.i686
new file mode 100644 (file)
index 0000000..e5730c8
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# GDM
+
+gdm-plymouth
diff --git a/modules/gdm/packages_aur.pen4/plymouth/gdm.pen4 b/modules/gdm/packages_aur.pen4/plymouth/gdm.pen4
new file mode 100644 (file)
index 0000000..e5730c8
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# GDM
+
+gdm-plymouth
diff --git a/modules/gdm/packages_aur.x86_64/plymouth/gdm.x86_64 b/modules/gdm/packages_aur.x86_64/plymouth/gdm.x86_64
new file mode 100644 (file)
index 0000000..e5730c8
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# GDM
+
+gdm-plymouth
index 84d09d3..471582f 100644 (file)
@@ -8,3 +8,5 @@
 # Supported architecture list
 
 x86_64
+i686
+pen4
diff --git a/modules/gtk-tools/packages.pen4/disk_management.pen4 b/modules/gtk-tools/packages.pen4/disk_management.pen4
new file mode 100644 (file)
index 0000000..6197081
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Disk management
+
+baobab
+gnome-disk-utility
+gparted
diff --git a/modules/gtk-tools/packages.pen4/internet-gui.pen4 b/modules/gtk-tools/packages.pen4/internet-gui.pen4
new file mode 100644 (file)
index 0000000..9eac9a8
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Internet
+
+#-- security --#
+gufw
diff --git a/modules/gtk-tools/packages.pen4/media.pen4 b/modules/gtk-tools/packages.pen4/media.pen4
new file mode 100644 (file)
index 0000000..0f93cc2
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Media
+
+#-- media player --#
+viewnior
diff --git a/modules/gtk-tools/packages.pen4/other.pen4 b/modules/gtk-tools/packages.pen4/other.pen4
new file mode 100644 (file)
index 0000000..6586737
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- system monitor --#
+gnome-system-monitor
diff --git a/modules/pipewire/packages.pen4/pipewire.pen4 b/modules/pipewire/packages.pen4/pipewire.pen4
new file mode 100644 (file)
index 0000000..25b3b32
--- /dev/null
@@ -0,0 +1,18 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# PipeWire
+
+
+#-- audio --#
+pavucontrol
+pipewire
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
diff --git a/modules/pipewire/packages_aur.pen4/pipewire.pen4 b/modules/pipewire/packages_aur.pen4/pipewire.pen4
new file mode 100644 (file)
index 0000000..1f47454
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+pipewire-jack-dropin
+pipewire-enable-bluez5
diff --git a/modules/share-extra/airootfs.pen4/etc/pacman.conf b/modules/share-extra/airootfs.pen4/etc/pacman.conf
new file mode 100644 (file)
index 0000000..06c679f
--- /dev/null
@@ -0,0 +1,133 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = pentium4
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+#NoProgressBar
+CheckSpace
+#VerbosePkgLists
+ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+# Alter Linux
+[alter-stable]
+Include = /etc/pacman.d/mirrorlist-alter
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+# This is Yamada Hayao's personal repository.
+# It was used early but is now disabled.
+#[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
+#Server = https://xn--d-8o2b.com/repo/$repo/$arch
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
diff --git a/modules/share-extra/packages.pen4/base.pen4 b/modules/share-extra/packages.pen4/base.pen4
new file mode 100644 (file)
index 0000000..14de737
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Base packages
+
+
+base-devel
diff --git a/modules/share-extra/packages.pen4/disk_management.pen4 b/modules/share-extra/packages.pen4/disk_management.pen4
new file mode 100644 (file)
index 0000000..be5d1ef
--- /dev/null
@@ -0,0 +1,32 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Disk management
+
+#-- GUI --#
+#baobab
+#gnome-disk-utility
+#gparted
+
+#-- CLI --#
+clonezilla
+ddrescue
+dmraid
+fsarchiver
+gptfdisk
+hdparm
+lvm2
+mdadm
+nvme-cli
+partclone
+parted
+partimage
+sdparm
+smartmontools
+testdisk
diff --git a/modules/share-extra/packages.pen4/exclude b/modules/share-extra/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/modules/share-extra/packages.pen4/filesystem.pen4 b/modules/share-extra/packages.pen4/filesystem.pen4
new file mode 100644 (file)
index 0000000..3ea44e4
--- /dev/null
@@ -0,0 +1,15 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# File System
+
+
+#-- mtp --#
+gvfs-mtp
+mtpfs
diff --git a/modules/share-extra/packages.pen4/fonts.pen4 b/modules/share-extra/packages.pen4/fonts.pen4
new file mode 100644 (file)
index 0000000..6895fa3
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Fonts
+
+
+# font
+adobe-source-code-pro-fonts
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
diff --git a/modules/share-extra/packages.pen4/internet-gui.pen4 b/modules/share-extra/packages.pen4/internet-gui.pen4
new file mode 100644 (file)
index 0000000..aef1983
--- /dev/null
@@ -0,0 +1,23 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Internet
+
+
+#-- connection --#
+network-manager-applet
+
+
+#-- mail client --#
+thunderbird
+# mailspring
+
+
+#-- web browser --#
+firefox
diff --git a/modules/share-extra/packages.pen4/lang/ja.pen4 b/modules/share-extra/packages.pen4/lang/ja.pen4
new file mode 100644 (file)
index 0000000..db1f696
--- /dev/null
@@ -0,0 +1,27 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# This package list will only be installed if the Japanese option is enabled.
+#
+# Japanese package
+
+# fcitx config
+alterlinux-fcitx-conf
+
+# fcitx
+fcitx
+fcitx-configtool
+fcitx-mozc
+fcitx-qt5
+
+# Firefox
+#firefox-i18n-ja
+
+# LibreOffice
+libreoffice-still-ja
diff --git a/modules/share-extra/packages.pen4/media.pen4 b/modules/share-extra/packages.pen4/media.pen4
new file mode 100644 (file)
index 0000000..22724c8
--- /dev/null
@@ -0,0 +1,19 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Media
+
+#-- bluetooth --#
+blueman
+bluez
+bluez-utils
+
+
+#-- media player --#
+vlc
diff --git a/modules/share-extra/packages.pen4/other.pen4 b/modules/share-extra/packages.pen4/other.pen4
new file mode 100644 (file)
index 0000000..8f91664
--- /dev/null
@@ -0,0 +1,51 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+
+#-- archiver --#
+xarchiver
+
+
+#-- GVFS --#
+smbclient
+gvfs
+gvfs-smb
+
+
+#-- boot manager --#
+# grub-theme-vimix-alter
+grub-theme-vimix
+grub-customizer
+
+
+#-- documents --#
+man-db
+man-pages
+
+
+#-- system monitor --#
+htop
+
+
+#-- pacman --#
+gnome-packagekit
+
+
+#-- printer --#
+system-config-printer
+
+
+#-- text editor --#
+nano
+vim
+
+
+#-- other --#
+libreoffice-still
diff --git a/modules/share-extra/packages.pen4/scripts.pen4 b/modules/share-extra/packages.pen4/scripts.pen4
new file mode 100644 (file)
index 0000000..f1f6229
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+# lap1sid
+# Twitter: @Pixel_3a
+# Email  : lap1sid@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- scripts --#
+fascode-gtk-bookmarks
+alterlinux-desktop-file
+alterlinux-welcome-page
diff --git a/modules/share-extra/packages.pen4/xorg.pen4 b/modules/share-extra/packages.pen4/xorg.pen4
new file mode 100644 (file)
index 0000000..281db57
--- /dev/null
@@ -0,0 +1,35 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Xorg
+
+#-- xorg --#
+gpm
+xorg-server
+xorg-xinit
+
+#-- drivers --#
+xf86-video-voodoo
+xf86-video-vmware
+xf86-video-vesa
+xf86-video-sisusb
+xf86-video-openchrome
+xf86-video-nouveau
+xf86-video-intel
+xf86-video-fbdev
+xf86-video-dummy
+xf86-video-ati
+xf86-video-amdgpu
+xf86-input-wacom
+xf86-input-void
+xf86-input-vmmouse
+xf86-input-synaptics
+xf86-input-libinput
+xf86-input-evdev
+xf86-input-elographics
index 7e1cdbe..f7ea071 100644 (file)
@@ -8,4 +8,4 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-vlc-plugin-fluidsynth-bin
+#vlc-plugin-fluidsynth-bin
index 7e1cdbe..f7ea071 100644 (file)
@@ -8,4 +8,4 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-vlc-plugin-fluidsynth-bin
+#vlc-plugin-fluidsynth-bin
diff --git a/modules/share-extra/packages_aur.pen4/fonts.pen4 b/modules/share-extra/packages_aur.pen4/fonts.pen4
new file mode 100644 (file)
index 0000000..865b299
--- /dev/null
@@ -0,0 +1,15 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Fonts
+
+
+# font
+
+nerd-fonts-source-code-pro
diff --git a/modules/share-extra/packages_aur.pen4/lang/ja.pen4 b/modules/share-extra/packages_aur.pen4/lang/ja.pen4
new file mode 100644 (file)
index 0000000..9f52d22
--- /dev/null
@@ -0,0 +1,15 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# This package list will only be installed if the Japanese option is enabled.
+#
+# Japanese package
+
+# other
+man-pages-ja
diff --git a/modules/share-extra/packages_aur.pen4/medit.pen4 b/modules/share-extra/packages_aur.pen4/medit.pen4
new file mode 100644 (file)
index 0000000..ac5214f
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+alterlinux-medit-themes
+medit
diff --git a/modules/share-extra/packages_aur.pen4/other.pen4 b/modules/share-extra/packages_aur.pen4/other.pen4
new file mode 100644 (file)
index 0000000..828e4c3
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- other --#
+ipad_charge-git
+tlpui
diff --git a/modules/share-extra/packages_aur.pen4/plymouth/theme.pen4 b/modules/share-extra/packages_aur.pen4/plymouth/theme.pen4
new file mode 100644 (file)
index 0000000..eecddd1
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+plymouth-theme-alter-logo-git
diff --git a/modules/share-extra/packages_aur.pen4/vlc.pen4 b/modules/share-extra/packages_aur.pen4/vlc.pen4
new file mode 100644 (file)
index 0000000..f7ea071
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#vlc-plugin-fluidsynth-bin
index 7e1cdbe..f7ea071 100644 (file)
@@ -8,4 +8,4 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-vlc-plugin-fluidsynth-bin
+#vlc-plugin-fluidsynth-bin
diff --git a/modules/share/airootfs.pen4/etc/systemd/system/pacman-init.service b/modules/share/airootfs.pen4/etc/systemd/system/pacman-init.service
new file mode 100644 (file)
index 0000000..91faec8
--- /dev/null
@@ -0,0 +1,17 @@
+[Unit]
+Description=Initializes Pacman keyring
+#Wants=haveged.service
+#After=haveged.service
+Requires=etc-pacman.d-gnupg.mount
+After=etc-pacman.d-gnupg.mount
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/pacman-key --init
+ExecStart=/usr/bin/pacman-key --populate archlinux
+ExecStart=/usr/bin/pacman-key --populate archlinux32
+ExecStart=/usr/bin/pacman-key --populate alterlinux
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/share/packages.pen4/archives.pen4 b/modules/share/packages.pen4/archives.pen4
new file mode 100644 (file)
index 0000000..7477684
--- /dev/null
@@ -0,0 +1,29 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Archives
+
+
+arj
+binutils
+bzip2
+cpio
+gzip
+lha
+lrzip
+lz4
+lzip
+lzop
+p7zip
+tar
+unarj
+unrar
+xz
+zip
+zstd
diff --git a/modules/share/packages.pen4/base.pen4 b/modules/share/packages.pen4/base.pen4
new file mode 100644 (file)
index 0000000..0a53cb4
--- /dev/null
@@ -0,0 +1,21 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Base packages
+
+base-devel
+
+bash
+#haveged
+intel-ucode
+amd-ucode
+mkinitcpio-nfs-utils
+nbd
+
+#edk2-shell
diff --git a/modules/share/packages.pen4/exclude b/modules/share/packages.pen4/exclude
new file mode 100644 (file)
index 0000000..87e1e6a
--- /dev/null
@@ -0,0 +1,14 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# channels/share/packages/exclude
+#
+# DO NOT EDIT THIS FILE.
+# The packages described in this file are packages
+# that should not be described in the package list
+# because they are automatically detected
+# and installed by the build script.
+#
diff --git a/modules/share/packages.pen4/filesystem.pen4 b/modules/share/packages.pen4/filesystem.pen4
new file mode 100644 (file)
index 0000000..91fd397
--- /dev/null
@@ -0,0 +1,24 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# File System
+
+
+btrfs-progs
+dosfstools
+# exfat-utils archiso v47で exfatprogs に置き換えられました
+exfatprogs
+f2fs-tools
+jfsutils
+mtools
+nfs-utils
+nilfs-utils
+ntfs-3g
+reiserfsprogs
+xfsprogs
diff --git a/modules/share/packages.pen4/grub.pen4 b/modules/share/packages.pen4/grub.pen4
new file mode 100644 (file)
index 0000000..44e42ab
--- /dev/null
@@ -0,0 +1,19 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# boot tools
+#
+
+# Grub
+grub
+os-prober
+
+# EFI
+efibootmgr
+efitools
diff --git a/modules/share/packages.pen4/hardware.pen4 b/modules/share/packages.pen4/hardware.pen4
new file mode 100644 (file)
index 0000000..2aee136
--- /dev/null
@@ -0,0 +1,28 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Hardware
+#
+
+
+#-- drivers --#
+b43-fwcutter
+ipw2100-fw
+ipw2200-fw
+
+
+#-- interface support --#
+lsscsi
+sg3_utils
+usb_modeswitch
+usbutils
+
+#-- printers --#
+cups
+cups-pdf
diff --git a/modules/share/packages.pen4/internet.pen4 b/modules/share/packages.pen4/internet.pen4
new file mode 100644 (file)
index 0000000..a6c057c
--- /dev/null
@@ -0,0 +1,60 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Internet
+
+
+#-- chat --#
+irssi
+
+
+#-- connection --#
+dhclient
+dnsutils
+ndisc6
+networkmanager
+ppp
+pptpclient
+rp-pppoe
+wvdial
+
+
+#-- client --#
+openssh
+wget
+
+
+#-- server --#
+darkhttpd
+dnsmasq
+
+
+
+#-- wireless --#
+crda
+iwd
+wireless-regdb
+wireless_tools
+wpa_supplicant
+
+
+#-- vpn --#
+networkmanager-openvpn
+openconnect
+openvpn
+vpnc
+xl2tpd
+
+
+#-- other tools --#
+ethtool
+gnu-netcat
+# nmap
+rsync
+tcpdump
diff --git a/modules/share/packages.pen4/kernel/core.pen4 b/modules/share/packages.pen4/kernel/core.pen4
new file mode 100644 (file)
index 0000000..eddffac
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+linux
+linux-headers
+
+broadcom-wl
diff --git a/modules/share/packages.pen4/kernel/lts.pen4 b/modules/share/packages.pen4/kernel/lts.pen4
new file mode 100644 (file)
index 0000000..30c54cd
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+linux-lts
+linux-lts-headers
+
+broadcom-wl-dkms
diff --git a/modules/share/packages.pen4/kernel/zen.pen4 b/modules/share/packages.pen4/kernel/zen.pen4
new file mode 100644 (file)
index 0000000..3279fc1
--- /dev/null
@@ -0,0 +1,14 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+linux-zen
+linux-zen-headers
+
+broadcom-wl-dkms
diff --git a/modules/share/packages.pen4/memtest86/memtest86+.pen4 b/modules/share/packages.pen4/memtest86/memtest86+.pen4
new file mode 100644 (file)
index 0000000..1b57866
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+memtest86+
diff --git a/modules/share/packages.pen4/other.pen4 b/modules/share/packages.pen4/other.pen4
new file mode 100644 (file)
index 0000000..15fee95
--- /dev/null
@@ -0,0 +1,36 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Other
+
+
+#-- commandline tools --#
+arch-install-scripts
+bash-completion
+git
+jq
+mc
+python-srcinfo
+
+
+#-- utility --#
+neofetch
+sudo
+tlp
+xdg-user-dirs
+
+
+#-- linux --#
+linux-atm
+linux-firmware
+
+
+#-- man --#
+man-db
+man-pages
diff --git a/modules/share/packages.pen4/pacman.pen4 b/modules/share/packages.pen4/pacman.pen4
new file mode 100644 (file)
index 0000000..951f347
--- /dev/null
@@ -0,0 +1,18 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# package management
+
+#-- keyring --#
+alterlinux-keyring
+
+
+#-- mirrorlist --#
+alterlinux-mirrorlist
+reflector
index a6b3cf6..a9763b6 100644 (file)
@@ -9,7 +9,7 @@
 #
 
 #-- archiver --#
-unzip-iconv
+#unzip-iconv
 
 #-- pacman --#
 aptpac
diff --git a/modules/share/packages_aur.pen4/other.pen4 b/modules/share/packages_aur.pen4/other.pen4
new file mode 100644 (file)
index 0000000..617c6e1
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- pacman --#
+aptpac
diff --git a/modules/share/packages_aur.pen4/plymouth/plymouth.pen4 b/modules/share/packages_aur.pen4/plymouth/plymouth.pen4
new file mode 100644 (file)
index 0000000..8e74041
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+plymouth
\ No newline at end of file
index a6b3cf6..a9763b6 100644 (file)
@@ -9,7 +9,7 @@
 #
 
 #-- archiver --#
-unzip-iconv
+#unzip-iconv
 
 #-- pacman --#
 aptpac
diff --git a/modules/zsh-powerline/packages.pen4/shell.pen4 b/modules/zsh-powerline/packages.pen4/shell.pen4
new file mode 100644 (file)
index 0000000..822230d
--- /dev/null
@@ -0,0 +1,20 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Intaractive shell
+
+#-- lsd --#
+lsd
+
+#-- zsh --#
+zsh
+zsh-autosuggestions
+zsh-completions
+zsh-history-substring-search
+zsh-syntax-highlighting
diff --git a/modules/zsh-powerline/packages_aur.pen4/fonts.pen4 b/modules/zsh-powerline/packages_aur.pen4/fonts.pen4
new file mode 100644 (file)
index 0000000..75c039f
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Fonts
+
+nerd-fonts-source-code-pro
diff --git a/modules/zsh-powerline/packages_aur.pen4/lsd.pen4 b/modules/zsh-powerline/packages_aur.pen4/lsd.pen4
new file mode 100644 (file)
index 0000000..5d6c94f
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+lsd-control
diff --git a/modules/zsh-powerline/packages_aur.pen4/powerline.pen4 b/modules/zsh-powerline/packages_aur.pen4/powerline.pen4
new file mode 100644 (file)
index 0000000..56e6cf5
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- Prompt --#
+powerline-go
index 2a0de95..f1aa674 100755 (executable)
@@ -6,6 +6,8 @@
 #
 # (c) 2019-2021 Fascode Network.
 #
+#shellcheck disable=SC2001
+
 set -e -u
 
 aur_username="aurbuild"
@@ -13,25 +15,37 @@ pacman_debug=false
 pacman_args=()
 failedpkg=()
 remove_list=()
-yay_depends=("go")
+aur_helper_depends=("go")
+aur_helper_command="yay"
+aur_helper_package="yay"
+aur_helper_args=()
+pkglist=()
 
 trap 'exit 1' 1 2 3 15
 
 _help() {
-    echo "usage ${0} [option]"
+    echo "usage ${0} [option] [aur helper args] ..."
     echo
-    echo "Install aur packages with yay
+    echo "Install aur packages with ${aur_helper_command}
     echo
     echo " General options:"
-    echo "    -d                       Enable pacman debug message"
+    echo "    -a [command]             Set the command of aur helper"
+    echo "    -c                       Enable pacman debug message"
+    echo "    -e [pkg]                 Set the package name of aur helper"
+    echo "    -d [pkg1,pkg2...]        Set the oackage of the depends of aur helper"
+    echo "    -p [pkg1,pkg2...]        Set the AUR package to install"
     echo "    -u [user]                Set the user name to build packages"
     echo "    -x                       Enable bash debug message"
     echo "    -h                       This help message"
 }
 
-while getopts "du:xh" arg; do
+while getopts "a:cd:e:p:u:xh" arg; do
     case "${arg}" in
-        d) pacman_debug=true ;;
+        a) aur_helper_command="${OPTARG}" ;;
+        c) pacman_debug=true ;;
+        e) aur_helper_package="${OPTARG}" ;;
+        p) readarray -t pkglist < <(sed "s|,$||g" <<< "${OPTARG}" | tr "," "\n") ;;
+        d) readarray -t aur_helper_depends < <(sed "s|,$||g" <<< "${OPTARG}" | tr "," "\n") ;;
         u) aur_username="${OPTARG}" ;;
         x) set -xv ;;
         h) 
@@ -46,6 +60,8 @@ while getopts "du:xh" arg; do
 done
 
 shift "$((OPTIND - 1))"
+aur_helper_args=("${@}")
+eval set -- "${pkglist[@]}"
 
 # Show message when file is removed
 # remove <file> <file> ...
@@ -82,57 +98,50 @@ if [[ "${pacman_debug}" = true ]]; then
     pacman_args+=("--debug")
 fi
 
-# Install yay
-if ! pacman -Qq yay 1> /dev/null 2>&1; then
-    # Update database
+# Install
+if ! pacman -Qq "${aur_helper_package}" 1> /dev/null 2>&1; then
     _oldpwd="$(pwd)"
-    pacman -Syy "${pacman_args[@]}"
 
     # Install depends
-    for _pkg in "${yay_depends[@]}"; do
+    for _pkg in "${aur_helper_depends[@]}"; do
         if ! pacman -Qq "${_pkg}" > /dev/null 2>&1 | grep -q "${_pkg}"; then
+            # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない
             pacman -S --asdeps --needed "${pacman_args[@]}" "${_pkg}"
-            remove_list+=("${_pkg}")
+            #remove_list+=("${_pkg}")
         fi
     done
 
-    # Build yay
-    sudo -u "${aur_username}" git clone "https://aur.archlinux.org/yay.git" "/tmp/yay"
-    cd "/tmp/yay"
-    sudo -u "${aur_username}" makepkg --ignorearch --clean --cleanbuild --force --skippgpcheck --noconfirm
+    # Build
+    sudo -u "${aur_username}" git clone "https://aur.archlinux.org/${aur_helper_package}.git" "/tmp/${aur_helper_package}"
+    cd "/tmp/${aur_helper_package}"
+    sudo -u "${aur_username}" makepkg --ignorearch --clean --cleanbuild --force --skippgpcheck --noconfirm --syncdeps
 
-    # Install yay
-    for _pkg in $(sudo -u "${aur_username}" makepkg --packagelist); do
+    # Install
+    for _pkg in $(cd "/tmp/${aur_helper_package}"; sudo -u "${aur_username}" makepkg --packagelist); do
         pacman "${pacman_args[@]}" -U "${_pkg}"
     done
 
     # Remove debtis
     cd ..
-    remove "/tmp/yay"
+    remove "/tmp/${aur_helper_package}"
     cd "${_oldpwd}"
 fi
 
-if ! type -p yay > /dev/null; then
-    echo "Failed to install yay"
+if ! type -p "${aur_helper_command}" > /dev/null; then
+    echo "Failed to install ${aur_helper_package}"
     exit 1
 fi
 
+# Update database
+pacman -Syy "${pacman_args[@]}"
+
 installpkg(){
     yes | sudo -u "${aur_username}" \
-        yay -Sy \
-            --mflags "-AcC" \
-            --aur \
-            --nocleanmenu \
-            --nodiffmenu \
-            --noeditmenu \
-            --noupgrademenu \
-            --noprovides \
-            --removemake \
-            --useask \
+        "${aur_helper_command}" -S \
             --color always \
-            --mflags "--skippgpcheck" \
-            "${pacman_args[@]}" \
             --cachedir "/var/cache/pacman/pkg/" \
+            "${pacman_args[@]}" \
+            "${aur_helper_args[@]}" \
             "${@}" || true
 }
 
@@ -163,7 +172,7 @@ readarray -t -O "${#remove_list[@]}" remove_list < <(pacman -Qttdq)
 (( "${#remove_list[@]}" != 0 )) && pacman -Rsnc "${remove_list[@]}" "${pacman_args[@]}"
 
 # Clean up
-yay -Sccc "${pacman_args[@]}"
+"${aur_helper_command}" -Sccc "${pacman_args[@]}"
 
 # remove user and file
 userdel "${aur_username}"
diff --git a/system/kernel-pen4 b/system/kernel-pen4
new file mode 100644 (file)
index 0000000..4b77ce0
--- /dev/null
@@ -0,0 +1,18 @@
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+#
+# kernel list for i686
+#
+# Enter the kernel package and header package name in the kernel package list.
+#
+#[kernel name]               [kernel filename]               [mkinitcpio profile]
+#
+
+core                         vmlinuz-linux                   linux
+lts                          vmlinuz-linux-lts               linux-lts
+zen                          vmlinuz-linux-zen               linux-zen
diff --git a/system/locale-pen4 b/system/locale-pen4
new file mode 100644 (file)
index 0000000..b6c7f1f
--- /dev/null
@@ -0,0 +1,20 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+#
+# locale list
+#
+# <locale name>     <locale.gen>     <lang version name>     <timezone>     <fullname>
+#
+
+# Global version
+gl                  en_US.UTF-8      gl                      UTC            global
+
+# Japanese
+ja                  ja_JP.UTF-8      ja                      Asia/Tokyo     japanese
+
+# English
+en                  en_US.UTF-8      en                      UTC            english
index 14d2e05..d46f082 100644 (file)
@@ -80,13 +80,13 @@ LocalFileSigLevel = Optional
 # after the header, and they will be used before the default mirrors.
 
 [alter-stable]
+Server = https://fascodenet.github.io/$repo/$arch/
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
-Server = https://fascodenet.github.io/$repo/$arch/
 
 #[testing]
 #Server = http://de.mirror.archlinux32.org/$arch/$repo/
index d71da2d..6647697 100644 (file)
@@ -80,13 +80,13 @@ LocalFileSigLevel = Optional
 # after the header, and they will be used before the default mirrors.
 
 [alter-stable]
+Server = https://fascodenet.github.io/$repo/$arch/
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
-Server = https://fascodenet.github.io/$repo/$arch/
 
 #[testing]
 #Server = http://de.mirror.archlinux32.org/$arch/$repo/
diff --git a/system/pacman-pen4.conf b/system/pacman-pen4.conf
new file mode 100644 (file)
index 0000000..e2dd6f9
--- /dev/null
@@ -0,0 +1,131 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# This is only used at build time.
+# In the configuration for the build, the repository mirror is specified directly.
+#
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = pentium4
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#NoProgressBar
+CheckSpace
+#VerbosePkgLists
+ParallelDownloads = 8
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[alter-stable]
+#Server = https://fascodenet.github.io/$repo/$arch/
+#Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
+#Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
+#Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
+#Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
+#Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
+#Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
+
+#[testing]
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[core]
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[extra]
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+#[community-testing]
+#Server = http://de.mirror.archlinux32.org/$arch/$repo/
+#Server = https://de.mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.org/$arch/$repo/
+#Server = https://mirror.archlinux32.org/$arch/$repo/
+#Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+[community]
+Server = http://de.mirror.archlinux32.org/$arch/$repo/
+Server = https://de.mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.org/$arch/$repo/
+Server = https://mirror.archlinux32.org/$arch/$repo/
+Server = http://mirror.archlinux32.oss/$arch/$repo/
+
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
index dc23755..571b8be 100644 (file)
@@ -80,13 +80,13 @@ LocalFileSigLevel = Optional
 # after the header, and they will be used before the default mirrors.
 
 [alter-stable]
+Server = https://fascodenet.github.io/$repo/$arch/
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
 Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
-Server = https://fascodenet.github.io/$repo/$arch/
 
 #[testing]
 #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
index e813c7f..e1af63f 100755 (executable)
@@ -19,15 +19,15 @@ _help() {
     echo "Build and install PKGBUILD" 
     echo
     echo " General options:"
-    echo "    -d                       Enable pacman debug message"
+    echo "    -c                       Enable pacman debug message"
     echo "    -u [user]                Set the user name to build packages"
     echo "    -x                       Enable bash debug message"
     echo "    -h                       This help message"
 }
 
-while getopts "du:xh" arg; do
+while getopts "cu:xh" arg; do
     case "${arg}" in
-        d) pacman_debug=true ;;
+        c) pacman_debug=true ;;
         u) build_username="${OPTARG}" ;;
         x) set -xv ;;
         h) 
index 72fc4d2..6d8e571 100755 (executable)
@@ -95,6 +95,7 @@ while (( ${#} > 0 )); do
             then
                 SHARE_PKG_DIR="${2}/pkg"
                 SHARE_DB_DIR="${2}/sync"
+               shift 2
             else
                 echo "Error: The directory is not found or cannot make directory." 1>&2
                 exit 1
index 3e502b5..dbb1a4a 100755 (executable)
@@ -45,6 +45,10 @@ gen_locale_list() {
         msg_error "No architecture specified." 
         exit 1
     fi
+    if [[ ! -f "${script_path}/system/locale-${arch}" ]]; then
+        msg_error "Missing architecture ${arch}"
+        exit 1
+    fi
     local _locale
     for _locale in $(grep -h -v ^'#' "${script_path}/system/locale-${arch}" | grep -v ^$ | getclm 1); do 
         localelist+=("${_locale}")