Skip to content

Commit 99ede2a

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents f6ea195 + 9f56c63 commit 99ede2a

376 files changed

Lines changed: 7892 additions & 512 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ pkg/
1313
src/
1414
out/
1515
work/
16+
*.local.*

‎Makefile‎

Lines changed: 8 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,24 @@
11
BUILD_SCRIPT = build.sh
22
SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter"
33
DEBUG_OPTION = -t '-Xcompression-level 1' -x
4-
CHANNEL_NAME = "stable"
54

65

7-
basic:
8-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${CHANNEL_NAME}
6+
xfce:
7+
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} xfce
98
@make cleanup
109

11-
core:
12-
@sudo ./${BUILD_SCRIPT} -k core ${SHARE_OPTION} ${CHANNEL_NAME}
10+
plasma:
11+
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} plasma
1312
@make cleanup
1413

15-
ck :
16-
@sudo ./${BUILD_SCRIPT} -k ck ${SHARE_OPTION} ${CHANNEL_NAME}
14+
xfce-test:
15+
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} xfce
1716
@make cleanup
1817

19-
lts:
20-
@sudo ./${BUILD_SCRIPT} -k lts ${SHARE_OPTION} ${CHANNEL_NAME}
18+
plasma-test:
19+
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} plasma
2120
@make cleanup
2221

23-
lqx:
24-
@sudo ./${BUILD_SCRIPT} -k lqx ${SHARE_OPTION} ${CHANNEL_NAME}
25-
@make cleanup
26-
27-
rt:
28-
@sudo ./${BUILD_SCRIPT} -k rt ${SHARE_OPTION} ${CHANNEL_NAME}
29-
@make cleanup
30-
31-
rt-lts:
32-
@sudo ./${BUILD_SCRIPT} -k rt-lts ${SHARE_OPTION} ${CHANNEL_NAME}
33-
@make cleanup
34-
35-
zen:
36-
@sudo ./${BUILD_SCRIPT} -k zen ${SHARE_OPTION} ${CHANNEL_NAME}
37-
@make cleanup
38-
39-
# xanmod:
40-
# @sudo ./${BUILD_SCRIPT} -k xanmod ${SHARE_OPTION} ${CHANNEL_NAME}
41-
# @make cleanup
42-
43-
xanmod-lts:
44-
@sudo ./${BUILD_SCRIPT} -k xanmod-lts ${SHARE_OPTION} ${CHANNEL_NAME}
45-
@make cleanup
46-
47-
48-
test-basic:
49-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
50-
@make cleanup
51-
52-
test-core:
53-
@sudo ./${BUILD_SCRIPT} -k core ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
54-
@make cleanup
55-
56-
test-ck:
57-
@sudo ./${BUILD_SCRIPT} -k ck ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
58-
@make cleanup
59-
60-
test-lts:
61-
@sudo ./${BUILD_SCRIPT} -k lts ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
62-
@make cleanup
63-
64-
test-lqx:
65-
@sudo ./${BUILD_SCRIPT} -k lqx ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
66-
@make cleanup
67-
68-
test-rt:
69-
@sudo ./${BUILD_SCRIPT} -k rt ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
70-
@make cleanup
71-
72-
test-rt-lts:
73-
@sudo ./${BUILD_SCRIPT} -k rt-lts ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
74-
@make cleanup
75-
76-
test-zen:
77-
@sudo ./${BUILD_SCRIPT} -k zen ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
78-
@make cleanup
79-
80-
# test-xanmod:
81-
# @sudo ./${BUILD_SCRIPT} -k xanmod ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
82-
# @make cleanup
83-
84-
test-xanmod-lts:
85-
@sudo ./${BUILD_SCRIPT} -k xanmod-lts ${SHARE_OPTION} ${DEBUG_OPTION} ${CHANNEL_NAME}
86-
@make cleanup
87-
88-
8922
cleanup:
9023
@[[ -d ./work ]] && sudo rm -rf ./work
9124
# @[[ -d ./out ]] && sudo rm -rf ./out

‎add-key.sh‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Yamada Hayao
4+
# Twitter: @Hayao0819
5+
# Email : hayao@fascone.net
6+
#
7+
# (c) 2019-2020 Fascode Network.
8+
#
9+
# add-key.sh
10+
#
11+
# Script to import AlterLinux and ArchLinux keys.
12+
#
13+
14+
15+
set -eu
16+
17+
script_path="$(readlink -f ${0%/*})"
18+
19+
20+
# Set pacman.conf when build alterlinux
21+
alter_pacman_conf="${script_path}/system/pacman.conf"
22+
23+
24+
# erro message
25+
msg_error() {
26+
echo -e "[add-key.sh] ERROR : ${@}" >&2
27+
}
28+
29+
30+
# info message
31+
msg_info() {
32+
echo -e "[add-key.sh] INFO: ${@}" >&1
33+
}
34+
35+
36+
# Show usage
37+
_usage () {
38+
echo "usage ${0} [options]"
39+
echo
40+
echo " General options:"
41+
echo " --alter Add alterlinux-keyring."
42+
echo " --arch Add archlinux-keyring"
43+
echo " -h Show this help and exit."
44+
}
45+
46+
47+
# Check if the package is installed.
48+
checkpkg() {
49+
local _pkg
50+
_pkg=$(echo "${1}" | cut -d'/' -f2)
51+
52+
if [[ ${#} -gt 2 ]]; then
53+
msg_error "Multiple package specification is not available."
54+
fi
55+
56+
if [[ -n $( pacman -Q "${_pkg}" 2> /dev/null| awk '{print $1}' ) ]]; then
57+
echo -n "true"
58+
else
59+
echo -n "false"
60+
fi
61+
}
62+
63+
64+
_pacman_install() {
65+
for i in ${@}; do
66+
if [[ $(checkpkg "${i}") = false ]]; then
67+
pacman -S --noconfirm "${i}"
68+
fi
69+
done
70+
}
71+
72+
73+
run() {
74+
msg_info "Running ${@}"
75+
${@}
76+
}
77+
78+
79+
prepare() {
80+
if [[ ! ${UID} = 0 ]]; then
81+
msg_error "You dont have root permission."
82+
msg_error 'Please run as root.'
83+
exit 1
84+
fi
85+
86+
if [[ ! -f "${alter_pacman_conf}" ]]; then
87+
msg_error "${alter_pacman_conf} does not exist."
88+
exit 1
89+
fi
90+
}
91+
92+
93+
update_arch_key() {
94+
pacman-key --init
95+
pacman-key --populate archlinux
96+
_pacman_install core/archlinux-keyring
97+
pacman-key --refresh-keys
98+
}
99+
100+
101+
update_system() {
102+
pacman -Syy
103+
}
104+
105+
106+
upgrade_system() {
107+
pacman -Syu
108+
}
109+
110+
111+
updae_alter_key() {
112+
curl -L -o "/tmp/fascode.pub" "https://山d.com/repo/fascode.pub"
113+
pacman-key -a "/tmp/fascode.pub"
114+
rm -f "/tmp/fascode.pub"
115+
pacman-key --lsign-key development@fascode.net
116+
117+
pacman --config "${alter_pacman_conf}" -Syy --noconfirm
118+
pacman --config "${alter_pacman_conf}" -S --noconfirm alter-stable/alterlinux-keyring
119+
120+
pacman-key --init
121+
pacman-key --populate alterlinux
122+
}
123+
124+
125+
# 引数解析
126+
while getopts 'h-:' arg; do
127+
case "${arg}" in
128+
h) _usage ; exit 0;;
129+
-)
130+
case "${OPTARG}" in
131+
alter)
132+
run prepare
133+
run updae_alter_key
134+
;;
135+
arch)
136+
run prepare
137+
run update_arch_key
138+
;;
139+
system)
140+
run prepare
141+
run update_system
142+
run upgrade_system
143+
;;
144+
help) _usage ;;
145+
esac
146+
;;
147+
*) _usage; exit 1;;
148+
esac
149+
done
150+
151+
152+
# 引数が何もなければ全てを実行する
153+
if [[ ${#} = 0 ]]; then
154+
run prepare
155+
run update_arch_key
156+
run update_system
157+
run updae_alter_key
158+
run update_system
159+
fi

0 commit comments

Comments
 (0)