Skip to content

Commit fe7423b

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents 9979e74 + 5343880 commit fe7423b

File tree

98 files changed

+258
-1746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+258
-1746
lines changed

‎Makefile‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,49 +20,32 @@ basic-64 basic-32 cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32
2020
@make clean
2121

2222
menuconfig/build/mconf::
23-
@if [ -d menuconfig/build ];\
24-
then \
25-
:;\
26-
else \
27-
mkdir menuconfig/build ;\
28-
fi
23+
@mkdir -p menuconfig/build
2924
(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
3025

3126
mkalteriso:
32-
@if [ -d system/cpp-src/mkalteriso/build ];\
33-
then \
34-
:;\
35-
else \
36-
mkdir system/cpp-src/mkalteriso/build ;\
37-
fi
38-
(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
27+
@mkdir -p system/cpp-src/mkalteriso/build
28+
@(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
3929

4030
menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
41-
menuconfig/build/mconf menuconfig-script/rootconf
31+
@menuconfig/build/mconf menuconfig-script/rootconf
4232

4333
menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
44-
${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
34+
@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
4535

4636
build_option:
47-
if [ -f .config ];\
48-
then \
49-
:;\
50-
else \
51-
make menuconfig ;\
52-
fi
37+
@if [ ! -f .config ]; then make menuconfig ; fi
5338
${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
5439

5540
clean:
5641
@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
5742

5843
build:build_option mkalteriso
5944
$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
60-
sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
45+
@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
6146

6247
keyring::
63-
sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
48+
@sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
6449

6550
wizard:
66-
sudo ${CURRENT_DIR}/tools/wizard.sh
67-
68-
51+
@sudo ${CURRENT_DIR}/tools/wizard.sh

‎build.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,10 +1036,11 @@ make_iso() {
10361036

10371037
# Parse options
10381038
ARGUMENT="${@}"
1039-
opt_short="a:bc:deg:hjk:l:o:p:rt:u:w:x"
1040-
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"
1041-
OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${DEFAULT_ARGUMENT} ${ARGUMENT})
1042-
[[ ${?} != 0 ]] && exit 1
1039+
OPT_S="a:bc:deg:hjk:l:o:p:rt:u:w:x"
1040+
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"
1041+
if ! OPT=$(getopt -o ${OPT_S} -l ${OPT_L} -- ${DEFAULT_ARGUMENT} ${ARGUMENT}); then
1042+
exit 1
1043+
fi
10431044

10441045
eval set -- "${OPT}"
10451046
msg_debug "Argument: ${OPT}"
@@ -1220,10 +1221,8 @@ msg_debug "Use the default configuration file (${defaultconfig})."
12201221
# Debug mode
12211222
if [[ "${bash_debug}" = true ]]; then set -x -v; fi
12221223

1223-
set +eu
1224-
12251224
# Check for a valid channel name
1226-
if [[ -n "${1}" ]]; then
1225+
if [[ -n "${1+SET}" ]]; then
12271226
case "$(bash "${tools_dir}/channel.sh" -n check "${1}")" in
12281227
"incorrect")
12291228
msg_error "Invalid channel ${1}" "1"
@@ -1237,6 +1236,9 @@ if [[ -n "${1}" ]]; then
12371236
channel_name="${1}"
12381237
;;
12391238
esac
1239+
else
1240+
channel_dir="${script_path}/channels/${channel_name}"
1241+
12401242
fi
12411243

12421244
# Set for special channels
@@ -1246,8 +1248,6 @@ if [[ -d "${channel_dir}.add" ]]; then
12461248
elif [[ "${channel_name}" = "clean" ]]; then
12471249
"${tools_dir}/clean.sh" -w "$(realpath "${work_dir}")" $([[ "${debug}" = true ]] && echo -n "-d")
12481250
exit 0
1249-
else
1250-
channel_dir="${script_path}/channels/${channel_name}"
12511251
fi
12521252

12531253
# Check channel version

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

File renamed without changes.

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ desktop-effects-unmaximize-effect='scale'
1919
desktop-effects-unmaximize-time=100
2020
desktop-effects-unmaximize-transition='easeOutBounce'
2121
enabled-applets=['panel1:left:0:[email protected]:0', 'panel1:left:1:[email protected]:2', 'panel1:right:0:[email protected]:3', 'panel1:right:1:[email protected]:4', 'panel1:right:2:[email protected]:5', 'panel1:right:3:[email protected]:6', 'panel1:right:4:[email protected]:7', 'panel1:right:5:[email protected]:8', 'panel1:right:6:[email protected]:9', 'panel1:right:7:[email protected]:10', 'panel1:right:8:[email protected]:11', 'panel1:right:9:[email protected]:12']
22-
hotcorner-layout=['expo:true:0', 'scale:false:0', ':true:0', 'desktop:true:0']
22+
hotcorner-layout=['expo:true:0', 'scale:false:0', ':false:0', 'desktop:true:0']
2323
next-applet-id=13
2424
panel-edit-mode=false
2525
panel-zone-symbolic-icon-sizes='[{"panelId": 1, "left": 28, "center": 28, "right": 16}]'
@@ -39,6 +39,12 @@ image-source='directory:///usr/share/backgrounds'
3939
gtk-theme='Arc-Dark'
4040
icon-theme='Inverse-blue-dark'
4141
scaling-factor=uint32 0
42+
toolkit-accessibility=false
43+
44+
[org/cinnamon/desktop/screensaver]
45+
allow-keyboard-shortcuts=false
46+
layout-group=0
47+
lock-enabled=false
4248

4349
[org/cinnamon/desktop/sound]
4450
event-sounds=false
@@ -47,4 +53,4 @@ event-sounds=false
4753
theme='Arc-Darker'
4854

4955
[org/cinnamon/theme]
50-
name='Adara-Dark'
56+
name='Adara-Dark'

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# /etc/bash.bashrc
3+
#
4+
5+
# If not running interactively, don't do anything
6+
[[ $- != *i* ]] && return
7+
8+
[[ $DISPLAY ]] && shopt -s checkwinsize
9+
10+
# PS1='[\u@\h \W]\$ '
11+
PS1='\u@\h:\w\$ '
12+
13+
[[ -f /etc/bash_aliases ]] && source /etc/bash_aliases
14+
[[ -f /etc/bash_functions ]] && source /etc/bash_functions
15+
16+
export EDITOR=nano
17+
export QT_QPA_PLATFORMTHEME=qt5ct

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

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -67,42 +67,9 @@ hinting='slight'
6767

6868
[org/gnome/shell]
6969
app-picker-view=uint32 0
70-
disabled-extensions=[
71-
'[email protected]',
72-
'[email protected]',
73-
'[email protected]',
74-
'native-window-placement@gnome-shell-extensions.gcampax.github.com',
75-
'[email protected]',
76-
'[email protected]'
77-
]
78-
enabled-extensions=[
79-
'[email protected]',
80-
'[email protected]',
81-
'[email protected]',
82-
'[email protected]',
83-
'[email protected]',
84-
'[email protected]',
85-
'[email protected]',
86-
'[email protected]',
87-
'[email protected]',
88-
'[email protected]',
89-
'[email protected]',
90-
'[email protected]'
91-
]
92-
favorite-apps=[
93-
'chromium.desktop',
94-
'org.gnome.Nautilus.desktop',
95-
'thunderbird.desktop',
96-
'libreoffice-startcenter.desktop',
97-
'medit.desktop',
98-
'vlc.desktop',
99-
'org.gnome.Screenshot.desktop',
100-
'org.gnome.Terminal.desktop',
101-
'org.gnome.Extensions.desktop',
102-
'pamac-updater.desktop',
103-
'gnome-control-center.desktop',
104-
'calamares.desktop'
105-
]
70+
disabled-extensions=['[email protected]', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', '[email protected]', '[email protected]']
71+
enabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]']
72+
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']
10673

10774
[org/gnome/shell/extensions/arc-menu]
10875
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']]

‎channels/gnome/airootfs.any/etc/skel/.profile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export QT_QPA_PLATFORMTHEME="qt5ct"

‎channels/gnome/airootfs.any/etc/zsh/zshenv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export EDITOR=nano
2+
export QT_QPA_PLATFORMTHEME=qt5ct

0 commit comments

Comments
 (0)