Merge branch 'dev' into dev-stable

Author: Hayao0819

Makefile

@@ -20,49 +20,32 @@ basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32
 	@make clean
 
 menuconfig/build/mconf::
-	@if [ -d menuconfig/build ];\
-	then \
-		:;\
-	else \
-		mkdir menuconfig/build ;\
-	fi
+	@mkdir -p menuconfig/build
 	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
 
 mkalteriso:
-	@if [ -d system/cpp-src/mkalteriso/build ];\
-	then \
-		:;\
-	else \
-		mkdir system/cpp-src/mkalteriso/build ;\
-	fi
-	(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
+	@mkdir -p system/cpp-src/mkalteriso/build
+	@(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
 
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
-	menuconfig/build/mconf menuconfig-script/rootconf
+	@menuconfig/build/mconf menuconfig-script/rootconf
 
 menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
-	${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
+	@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
 
 build_option:
-	if [ -f .config ];\
-	then \
-		:;\
-	else \
-		make menuconfig ;\
-	fi
+	@if [ ! -f .config ]; then make menuconfig ; fi
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
 	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
 
 build:build_option mkalteriso
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
-	sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
 
 keyring::
-	sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
+	@sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
 
 wizard:
-	sudo ${CURRENT_DIR}/tools/wizard.sh
-
-
+	@sudo ${CURRENT_DIR}/tools/wizard.sh

build.sh

@@ -1036,10 +1036,11 @@ make_iso() {
 
 # Parse options
 ARGUMENT="${@}"
-opt_short="a:bc:deg:hjk:l:o:p:rt:u:w:x"
-opt_long="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,shmkalteriso,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck"
-OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${DEFAULT_ARGUMENT} ${ARGUMENT})
-[[ ${?} != 0 ]] && exit 1
+OPT_S="a:bc:deg:hjk:l:o:p:rt:u:w:x"
+OPT_L="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,shmkalteriso,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck"
+if ! OPT=$(getopt -o ${OPT_S} -l ${OPT_L} -- ${DEFAULT_ARGUMENT} ${ARGUMENT}); then
+    exit 1
+fi
 
 eval set -- "${OPT}"
 msg_debug "Argument: ${OPT}"
@@ -1220,10 +1221,8 @@ msg_debug "Use the default configuration file (${defaultconfig})."
 # Debug mode
 if [[ "${bash_debug}" = true ]]; then set -x -v; fi
 
-set +eu
-
 # Check for a valid channel name
-if [[ -n "${1}" ]]; then
+if [[ -n "${1+SET}" ]]; then
     case "$(bash "${tools_dir}/channel.sh" -n check "${1}")" in
         "incorrect")
             msg_error "Invalid channel ${1}" "1"
@@ -1237,6 +1236,9 @@ if [[ -n "${1}" ]]; then
             channel_name="${1}"
             ;;
     esac
+else
+    channel_dir="${script_path}/channels/${channel_name}"
+
 fi
 
 # Set for special channels
@@ -1246,8 +1248,6 @@ if [[ -d "${channel_dir}.add" ]]; then
 elif [[ "${channel_name}" = "clean" ]]; then
    "${tools_dir}/clean.sh" -w "$(realpath "${work_dir}")" $([[ "${debug}" = true ]] && echo -n "-d")
     exit 0
-else
-    channel_dir="${script_path}/channels/${channel_name}"
 fi
 
 # Check channel version

…share-extra/airootfs.any/etc/bash.bashrc …ls/cinnamon/airootfs.any/etc/bash.bashrcchannels/share-extra/airootfs.any/etc/bash.bashrc renamed to channels/cinnamon/airootfs.any/etc/bash.bashrc channels/share-extra/airootfs.any/etc/bash.bashrc renamed to channels/cinnamon/airootfs.any/etc/bash.bashrc

@@ -19,7 +19,7 @@ desktop-effects-unmaximize-effect='scale'
 desktop-effects-unmaximize-time=100
 desktop-effects-unmaximize-transition='easeOutBounce'
 enabled-applets=['panel1:left:0:menu@cinnamon.org:0', 'panel1:left:1:grouped-window-list@cinnamon.org:2', 'panel1:right:0:systray@cinnamon.org:3', 'panel1:right:1:xapp-status@cinnamon.org:4', 'panel1:right:2:notifications@cinnamon.org:5', 'panel1:right:3:printers@cinnamon.org:6', 'panel1:right:4:removable-drives@cinnamon.org:7', 'panel1:right:5:keyboard@cinnamon.org:8', 'panel1:right:6:network@cinnamon.org:9', 'panel1:right:7:sound@cinnamon.org:10', 'panel1:right:8:power@cinnamon.org:11', 'panel1:right:9:calendar@cinnamon.org:12']
-hotcorner-layout=['expo:true:0', 'scale:false:0', ':true:0', 'desktop:true:0']
+hotcorner-layout=['expo:true:0', 'scale:false:0', ':false:0', 'desktop:true:0']
 next-applet-id=13
 panel-edit-mode=false
 panel-zone-symbolic-icon-sizes='[{"panelId": 1, "left": 28, "center": 28, "right": 16}]'
@@ -39,6 +39,12 @@ image-source='directory:///usr/share/backgrounds'
 gtk-theme='Arc-Dark'
 icon-theme='Inverse-blue-dark'
 scaling-factor=uint32 0
+toolkit-accessibility=false
+
+[org/cinnamon/desktop/screensaver]
+allow-keyboard-shortcuts=false
+layout-group=0
+lock-enabled=false
 
 [org/cinnamon/desktop/sound]
 event-sounds=false
@@ -47,4 +53,4 @@ event-sounds=false
 theme='Arc-Darker'
 
 [org/cinnamon/theme]
-name='Adara-Dark'
+name='Adara-Dark'

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

@@ -0,0 +1,17 @@
+#
+# /etc/bash.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+[[ $DISPLAY ]] && shopt -s checkwinsize
+
+# PS1='[\u@\h \W]\$ '
+PS1='\u@\h:\w\$ '
+
+[[ -f /etc/bash_aliases ]] && source /etc/bash_aliases
+[[ -f /etc/bash_functions ]] && source /etc/bash_functions
+
+export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct

…are-extra/airootfs.any/etc/skel/.profile …/cinnamon/airootfs.any/etc/skel/.profilechannels/share-extra/airootfs.any/etc/skel/.profile renamed to channels/cinnamon/airootfs.any/etc/skel/.profile channels/share-extra/airootfs.any/etc/skel/.profile renamed to channels/cinnamon/airootfs.any/etc/skel/.profile

@@ -67,42 +67,9 @@ hinting='slight'
 
 [org/gnome/shell]
 app-picker-view=uint32 0
-disabled-extensions=[
-    'window-list@gnome-shell-extensions.gcampax.github.com',
-    'drive-menu@gnome-shell-extensions.gcampax.github.com',
-    'places-menu@gnome-shell-extensions.gcampax.github.com',
-    'native-window-placement@gnome-shell-extensions.gcampax.github.com',
-    'apps-menu@gnome-shell-extensions.gcampax.github.com',
-    'pamac-updates@manjaro.org'
-]
-enabled-extensions=[
-    'extensions@abteil.org',
-    'user-theme@gnome-shell-extensions.gcampax.github.com',
-    'dash-to-panel@jderose9.github.com',
-    'ding@rastersoft.com',
-    'CoverflowAltTab@palatis.blogspot.com',
-    'workspace-indicator@gnome-shell-extensions.gcampax.github.com',
-    'windowsNavigator@gnome-shell-extensions.gcampax.github.com',
-    'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com',
-    'CoverflowAltTab@dmo60.de',
-    'arcmenu@arcmenu.com',
-    'clipboard-indicator@tudmotu.com',
-    'appindicatorsupport@rgcjonas.gmail.com'
-]
-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',
-    'pamac-updater.desktop',
-    'gnome-control-center.desktop', 
-    'calamares.desktop'
-]
+disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com', 'pamac-updates@manjaro.org']
+enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com']
+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', 'pamac-updater.desktop', 'gnome-control-center.desktop']
 
 [org/gnome/shell/extensions/arc-menu]
 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']]

…/share-extra/airootfs.any/etc/zsh/zshenv …els/cinnamon/airootfs.any/etc/zsh/zshenvchannels/share-extra/airootfs.any/etc/zsh/zshenv renamed to channels/cinnamon/airootfs.any/etc/zsh/zshenv channels/share-extra/airootfs.any/etc/zsh/zshenv renamed to channels/cinnamon/airootfs.any/etc/zsh/zshenv

@@ -0,0 +1 @@
+export QT_QPA_PLATFORMTHEME="qt5ct"

channels/gnome/airootfs.any/etc/bash.bashrc

@@ -0,0 +1,2 @@
+export EDITOR=nano
+export QT_QPA_PLATFORMTHEME=qt5ct