Merge branch 'dev' into dev-stable

Author: Hayao0819

Makefile

@@ -85,3 +85,11 @@ wizard:
 check:
 	@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
 	@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
+
+
+# デバッグ用
+ARCH         := x86_64
+CHANNEL      := xfce
+LOCALE       := ja
+custom:
+	sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} --arch ${ARCH} -l ${LOCALE} ${CHANNEL}

build.sh

@@ -389,7 +389,7 @@ prepare_build() {
     # Check modules
     module_check(){
         msg_debug -n "Checking ${1} module ... "
-        bash "${tools_dir}/module.sh" check "${1}" || msg_error "Module ${1} is not available." "1" && echo "${module_dir}/${1}"
+        bash "${tools_dir}/module.sh" check "${1}" || msg_error "Module ${1} is not available." "1" && msg_debug "Load ${module_dir}/${1}"
     }
     readarray -t modules < <(printf "%s\n" "${modules[@]}" | awk '!a[$0]++')
     for_module "module_check {}"

channels/i3/packages.i686/i3.i686

@@ -17,6 +17,7 @@ i3-gaps
 nitrogen
 picom
 conky
+polybar
 
 # launcher
 rofi

channels/i3/packages.x86_64/i3.x86_64

@@ -17,6 +17,7 @@ i3-gaps
 nitrogen
 picom
 conky
+polybar
 
 # launcher
 rofi

channels/i3/packages_aur.i686/i3.i686

@@ -10,7 +10,7 @@
 # i3wm relation packages
 
 # i3wm
-polybar
+#polybar
 
 # terminal emulator
 sakura

channels/i3/packages_aur.x86_64/i3.x86_64

@@ -10,7 +10,7 @@
 # i3wm relation packages
 
 # i3wm
-polybar
+#polybar
 
 # terminal emulator
 sakura

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/helpers.rc

@@ -0,0 +1 @@
+WebBrowser=chromium

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/calculator-2.rc

@@ -0,0 +1,5 @@
+degrees=false
+size=20
+hist_size=25
+output_base=10
+

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-4/15751404171.desktop

@@ -0,0 +1,26 @@
+[Desktop Entry]
+Version=1.0
+Name=Chromium
+GenericName=Web Browser
+GenericName[ja]=ウェブブラウザ
+Comment=Access the Internet
+Comment[ja]=インターネットにアクセス
+Exec=/usr/bin/chromium %U
+StartupNotify=true
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+Actions=new-window;new-private-window;
+X-XFCE-Source=file:///usr/share/applications/chromium.desktop
+
+[Desktop Action new-window]
+Name=New Window
+Name[ja]=新規ウインドウ
+Exec=/usr/bin/chromium
+
+[Desktop Action new-private-window]
+Name=New Incognito Window
+Name[ja]=新しいシークレット ウィンドウ
+Exec=/usr/bin/chromium --incognito

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-5/15751404272.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Thunar File Manager
+Name[ja]=Thunar ファイルマネージャー
+Comment=Browse the filesystem with the file manager
+Comment[ja]=ファイルマネージャーでファイルシステムを参照します
+GenericName=File Manager
+GenericName[ja]=ファイルマネージャー
+Exec=thunar %F
+Icon=Thunar
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;Utility;Core;GTK;FileTools;FileManager;
+MimeType=inode/directory;
+X-XFCE-Source=file:///usr/share/applications/thunar.desktop