Merge branch 'dev' into dev-stable

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

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-6/15751404383.desktop

@@ -0,0 +1,21 @@
+[Desktop Entry]
+Version=1.0
+Name=Xfce Terminal
+Name[ja]=Xfce Terminal
+Comment=Terminal Emulator
+Comment[ja]=ターミナルエミュレーター
+GenericName=Terminal Emulator
+GenericName[ja]=ターミナルエミュレーター
+Exec=xfce4-terminal
+Icon=utilities-terminal
+Terminal=false
+Type=Application
+Categories=GTK;System;TerminalEmulator;
+StartupNotify=true
+Actions=preferences;
+X-XFCE-Source=file:///usr/share/applications/xfce4-terminal.desktop
+
+[Desktop Action preferences]
+Name=Terminal Preferences
+Name[ja]=ターミナルの設定
+Exec=xfce4-terminal --preferences

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/whiskermenu-1.rc

@@ -0,0 +1,80 @@
+favorites=chromium.desktop
+recent=
+button-title=Applications
+button-icon=xfce4-whiskermenu
+button-single-row=false
+show-button-title=false
+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
+recent-items-max=0
+favorites-in-recent=false
+display-recent-default=false
+position-search-alternate=true
+position-commands-alternate=true
+position-categories-alternate=false
+stay-on-focus-out=false
+confirm-session-command=true
+menu-width=400
+menu-height=500
+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=false
+command-logoutuser=xfce4-session-logout --logout --fast
+show-command-logoutuser=true
+command-restart=xfce4-session-logout --reboot --fast
+show-command-restart=true
+command-shutdown=xfce4-session-logout --halt --fast
+show-command-shutdown=true
+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=false
+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
+

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="displays" version="1.0">
+  <property name="ActiveProfile" type="string" value="Default"/>
+  <property name="Default" type="empty">
+    <property name="VGA-1" type="string" value="VirtualBox ">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value="8b95bbf409b9eff7635d08a6b77f23bf5ade9cd3"/>
+      <property name="Resolution" type="string" value="1280x768"/>
+      <property name="RefreshRate" type="double" value="59.870228"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="true"/>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="0"/>
+        <property name="Y" type="int" value="0"/>
+      </property>
+    </property>
+  </property>
+</channel>

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="keyboards" version="1.0">
+  <property name="Default" type="empty">
+    <property name="Numlock" type="bool" value="false"/>
+  </property>
+</channel>

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="thunar" version="1.0">
+  <property name="last-view" type="string" value="ThunarIconView"/>
+  <property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
+  <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
+  <property name="last-separator-position" type="int" value="170"/>
+  <property name="last-show-hidden" type="bool" value="false"/>
+  <property name="last-window-maximized" type="bool" value="false"/>
+  <property name="last-window-width" type="int" value="777"/>
+  <property name="last-window-height" type="int" value="480"/>
+</channel>

channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-desktop" version="1.0">
+  <property name="desktop-menu" type="empty">
+    <property name="show" type="bool" value="false"/>
+  </property>
+  <property name="windowlist-menu" type="empty">
+    <property name="show" type="bool" value="false"/>
+  </property>
+  <property name="desktop-icons" type="empty">
+    <property name="file-icons" type="empty">
+      <property name="show-home" type="bool" value="false"/>
+      <property name="show-filesystem" type="bool" value="false"/>
+      <property name="show-trash" type="bool" value="false"/>
+      <property name="show-removable" type="bool" value="false"/>
+    </property>
+  </property>
+  <property name="last" type="empty">
+    <property name="window-width" type="int" value="751"/>
+    <property name="window-height" type="int" value="597"/>
+  </property>
+</channel>