Merge branch 'dev' into dev-stable

Author: Hayao0819

Makefile

@@ -9,7 +9,8 @@ ARCH_Pen4    := --arch pen4
 FULLBUILD    := -d -g -e -r 5 --noconfirm
 DEBUG_OPTION := --debug --log
 DEBUG        := false
-FULL_x86_64  := xfce cinnamon i3 plasma gnome
+#FULL_x86_64  := xfce cinnamon i3 plasma gnome
+FULL_x86_64  := xfce i3 plasma
 FULL_i686    := xfce lxde
 FULL_Pen4    := xfce lxde
 

build.sh

@@ -77,6 +77,16 @@ echo_blank(){ yes " " 2> /dev/null  | head -n "${1}" | tr -d "\n"; }
 # cpコマンドのラッパー
 _cp(){ cp -af --no-preserve=ownership,mode -- "${@}"; }
 
+# gitコマンドのラッパー
+# https://stackoverflow.com/questions/71901632/fatal-unsafe-repository-home-repon-is-owned-by-someone-else
+# https://qiita.com/megane42/items/5375b54ea3570506e296
+git(){
+    command git config --global safe.directory "$script_path"
+    command git "$@"
+    command git config --global --unset safe.directory "$script_path"
+}
+
+
 _usage () {
     cat "${script_path}/docs/build.sh/help.1"
     local blank="29" _arch _dirname _type _output _first
@@ -370,6 +380,12 @@ prepare_build() {
     modules=("${_modules[@]}")
     unset _modules
 
+    # Ignore modules
+    local _m
+    for _m in "${exclude_modules[@]}"; do
+        readarray -t modules < <(printf "%s\n" "${modules[@]}" | grep -xv "${_m}")
+    done
+
     # Check modules
     module_check(){
         msg_debug -n "Checking ${1} module ... "
@@ -668,8 +684,8 @@ make_setup_mkinitcpio() {
     [[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
 
     if [[ "${gpg_key}" ]]; then
-      gpg --export "${gpg_key}" >"${build_dir}/gpgkey"
-      exec 17<>"${build_dir}/gpgkey"
+        gpg --export "${gpg_key}" >"${build_dir}/gpgkey"
+        exec 17<>"${build_dir}/gpgkey"
     fi
 
     _chroot_run mkinitcpio -c "/etc/mkinitcpio-archiso.conf" -k "/boot/${kernel_filename}" -g "/boot/archiso.img"
@@ -726,10 +742,10 @@ make_syslinux() {
     # copy all syslinux config to work dir
     for _cfg in "${build_dir}/syslinux/"*.cfg; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%OS_NAME%|${os_name}|g;
-             s|%KERNEL_FILENAME%|${kernel_filename}|g;
-             s|%ARCH%|${arch}|g;
-             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
+            s|%OS_NAME%|${os_name}|g;
+            s|%KERNEL_FILENAME%|${kernel_filename}|g;
+            s|%ARCH%|${arch}|g;
+            s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
     done
 
     # Replace the SYSLINUX configuration file with or without boot splash.
@@ -1149,7 +1165,8 @@ else
 fi
 
 # Set vars
-build_dir="${work_dir}/build/${arch}" cache_dir="${work_dir}/cache/${arch}" airootfs_dir="${build_dir}/airootfs" isofs_dir="${build_dir}/iso" lockfile_dir="${build_dir}/lockfile" gitrev="$(cd "${script_path}"; git rev-parse --short HEAD)" preset_dir="${script_path}/presets"
+build_dir="${work_dir}/build/${arch}" cache_dir="${work_dir}/cache/${arch}" airootfs_dir="${build_dir}/airootfs" isofs_dir="${build_dir}/iso" lockfile_dir="${build_dir}/lockfile" preset_dir="${script_path}/presets"
+gitrev="$(cd "${script_path}"; git rev-parse --short HEAD)"
 
 # Create dir
 for _dir in build_dir cache_dir airootfs_dir isofs_dir lockfile_dir out_dir; do
@@ -1163,7 +1180,7 @@ if [[ -d "${channel_dir}.add" ]]; then
     channel_name="${1}"
     channel_dir="${channel_dir}.add"
 elif [[ "${channel_name}" = "clean" ]]; then
-   _run_cleansh
+    _run_cleansh
     exit 0
 fi
 

channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome

@@ -66,7 +66,7 @@ hinting='slight'
 app-picker-view=uint32 0
 disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'launch-new-instance@gnome-shell-extensions.gcampax.github.com', 'auto-move-windows@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com']
 enabled-extensions=['appindicatorsupport@rgcjonas.gmail.com', 'arcmenu@arcmenu.com', 'CoverflowAltTab@dmo60.de', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'pamac-updates@manjaro.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'clipboard-indicator@tudmotu.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com']
-favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
+favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
 
 [org/gnome/shell/extensions/arcmenu]
 application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']]
@@ -89,7 +89,7 @@ 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']
+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']
 prefs-visible-page=0
 right-panel-width=205
 searchbar-default-bottom-location='Bottom'

channels/gnome/packages.i686/exclude

@@ -1,3 +1 @@
 xf86-input-synaptics
-alterlinux-medit-themes
-medit

channels/gnome/packages.pen4/exclude

@@ -1,3 +1 @@
 xf86-input-synaptics
-alterlinux-medit-themes
-medit

channels/gnome/packages.x86_64/exclude

@@ -1,3 +1,2 @@
 xf86-input-synaptics
-alterlinux-medit-themes
-medit
+

channels/i3/airootfs.any/root/customize_airootfs_i3.sh

@@ -42,6 +42,8 @@ for _dir in "/etc/skel/" "/home/${username}/"; do
     done
 done
 
+chmod 755 "/usr/bin/alter-system-menu"
+
 # disable light-locker on live
 sed -i "/light/s/^/# /g" "/home/${username}/.config/i3/config"
 

channels/i3/packages.i686/i3.i686

@@ -21,9 +21,6 @@ conky
 # launcher
 rofi
 
-# terminal emulator
-sakura
-
 # theme manager
 alterlinux-i3-manager
 

channels/i3/packages.x86_64/i3.x86_64

@@ -21,9 +21,6 @@ conky
 # launcher
 rofi
 
-# terminal emulator
-sakura
-
 # theme manager
 alterlinux-i3-manager
 

channels/i3/packages_aur.i686/i3.i686

@@ -11,3 +11,6 @@
 
 # i3wm
 polybar
+
+# terminal emulator
+sakura