Skip to content

Commit 5d21275

Browse files
Hayao0819Hayao0819
committedAug 11, 2021
Merge branch 'dev' into dev-stable
·
2022071820210811
2 parents 55a8261 + b6793bd commit 5d21275

File tree

11 files changed

+71
-36
lines changed

11 files changed

+71
-36
lines changed
 

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter"
66
ARCH_x86_64 := --arch x86_64
77
ARCH_i686 := --arch i686
88
FULLBUILD := -d -g -e --noconfirm
9-
FULL_x86_64 := xfce cinnamon i3 plasma
9+
FULL_x86_64 := xfce cinnamon i3 plasma gnome
1010
FULL_i686 := xfce lxde
1111
CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
1212

‎channels/i3/airootfs.any/usr/share/backgrounds/alter-jiju.png

-1.9 MB
Binary file not shown.

‎channels/i3/airootfs.any/usr/share/backgrounds/alter-nochr.png

-621 KB
Binary file not shown.

‎channels/i3/airootfs.any/usr/share/backgrounds/alter-old.png

-2.85 MB
Binary file not shown.

‎channels/i3/airootfs.any/usr/share/backgrounds/alter.png

-653 KB
Binary file not shown.

‎modules/calamares/pkgbuild.any/01-ckbcomp/.SRCINFO

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pkgbase = ckbcomp
22
pkgdesc = Compile a XKB keyboard description to a keymap suitable for loadkeys or kbdcontrol
3-
pkgver = 1.203
3+
pkgver = 1.205
44
pkgrel = 1
55
url = http://anonscm.debian.org/cgit/d-i/console-setup.git/
66
arch = any
77
license = GPL2
88
depends = perl
9-
source = http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_1.203.tar.xz
10-
sha512sums = e73ade4a35c7d5e4986587067ab081da8b99acd1013ef2f9de63205f43a0777a917c0ce18e35f0fc95bfe22162ad56e0c92f1f9d657a27681a26d525441bcf2a
9+
source = http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_1.205.tar.xz
10+
sha512sums = SKIP
1111

1212
pkgname = ckbcomp

‎modules/calamares/pkgbuild.any/01-ckbcomp/PKGBUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
# Contributer: Nissar Chababy <funilrys at outlook dot com>
33
# Contributer: Jeroen Bollen <jbinero at gmail dot comau>
44

5-
pkgname=ckbcomp
6-
pkgver=1.203
5+
pkgname="ckbcomp"
6+
pkgver="1.205"
77
pkgrel=1
88
pkgdesc="Compile a XKB keyboard description to a keymap suitable for loadkeys or kbdcontrol"
99
arch=(any)
1010
url="http://anonscm.debian.org/cgit/d-i/console-setup.git/"
1111
license=('GPL2')
1212
depends=('perl')
1313
source=("http://ftp.de.debian.org/debian/pool/main/c/console-setup/console-setup_${pkgver}.tar.xz")
14-
sha512sums=('e73ade4a35c7d5e4986587067ab081da8b99acd1013ef2f9de63205f43a0777a917c0ce18e35f0fc95bfe22162ad56e0c92f1f9d657a27681a26d525441bcf2a')
14+
sha512sums=('SKIP')
1515

1616
package() {
1717
if [[ -d "${srcdir}/console-setup" ]]; then

‎system/aur.sh

+53-19
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ set -e -u
1111
aur_username="aurbuild"
1212
pacman_debug=false
1313
pacman_args=()
14+
failedpkg=()
15+
remove_list=()
16+
yay_depends=("go")
1417

1518
trap 'exit 1' 1 2 3 15
1619

@@ -81,31 +84,40 @@ fi
8184

8285
# Install yay
8386
if ! pacman -Qq yay 1> /dev/null 2>&1; then
84-
(
85-
_oldpwd="$(pwd)"
86-
pacman -Syy "${pacman_args[@]}"
87-
pacman -S --asdeps --needed "${pacman_args[@]}" go
88-
sudo -u "${aur_username}" git clone "https://aur.archlinux.org/yay.git" "/tmp/yay"
89-
cd "/tmp/yay"
90-
sudo -u "${aur_username}" makepkg --ignorearch --clean --cleanbuild --force --skippgpcheck --noconfirm
91-
for _pkg in $(sudo -u "${aur_username}" makepkg --packagelist); do
92-
pacman "${pacman_args[@]}" -U "${_pkg}"
93-
done
94-
cd ..
95-
remove "/tmp/yay"
96-
cd "${_oldpwd}"
97-
)
87+
# Update database
88+
_oldpwd="$(pwd)"
89+
pacman -Syy "${pacman_args[@]}"
90+
91+
# Install depends
92+
for _pkg in "${yay_depends[@]}"; do
93+
if ! pacman -Qq "${_pkg}" | grep -q "${_pkg}"; then
94+
pacman -S --asdeps --needed "${pacman_args[@]}" "${_pkg}"
95+
remove_list+=("${_pkg}")
96+
fi
97+
done
98+
99+
# Build yay
100+
sudo -u "${aur_username}" git clone "https://aur.archlinux.org/yay.git" "/tmp/yay"
101+
cd "/tmp/yay"
102+
sudo -u "${aur_username}" makepkg --ignorearch --clean --cleanbuild --force --skippgpcheck --noconfirm
103+
104+
# Install yay
105+
for _pkg in $(sudo -u "${aur_username}" makepkg --packagelist); do
106+
pacman "${pacman_args[@]}" -U "${_pkg}"
107+
done
108+
109+
# Remove debtis
110+
cd ..
111+
remove "/tmp/yay"
112+
cd "${_oldpwd}"
98113
fi
99114

100115
if ! type -p yay > /dev/null; then
101116
echo "Failed to install yay"
102117
exit 1
103118
fi
104119

105-
106-
# Build and install
107-
chmod +s /usr/bin/sudo
108-
for _pkg in "${@}"; do
120+
installpkg(){
109121
yes | sudo -u "${aur_username}" \
110122
yay -Sy \
111123
--mflags "-AcC" \
@@ -121,14 +133,36 @@ for _pkg in "${@}"; do
121133
--mflags "--skippgpcheck" \
122134
"${pacman_args[@]}" \
123135
--cachedir "/var/cache/pacman/pkg/" \
124-
"${_pkg}"
136+
"${@}" || true
137+
}
138+
139+
140+
# Build and install
141+
chmod +s /usr/bin/sudo
142+
for _pkg in "${@}"; do
143+
pacman -Qq "${_pkg}" > /dev/null 2>&1 && continue
144+
installpkg "${_pkg}"
145+
146+
if ! pacman -Qq "${_pkg}" > /dev/null 2>&1; then
147+
echo -e "\n[aur.sh] Failed to install ${_pkg}\n"
148+
failedpkg+=("${_pkg}")
149+
fi
150+
done
125151

152+
# Reinstall failed package
153+
for _pkg in "${failedpkg[@]}"; do
154+
installpkg "${_pkg}"
126155
if ! pacman -Qq "${_pkg}" > /dev/null 2>&1; then
127156
echo -e "\n[aur.sh] Failed to install ${_pkg}\n"
128157
exit 1
129158
fi
130159
done
131160

161+
# Remove packages
162+
readarray -t -O "${#remove_list[@]}" remove_list < <(pacman -Qttdq)
163+
(( "${#remove_list[@]}" != 0 )) && pacman -Rsnc "${remove_list[@]}" "${pacman_args[@]}"
164+
165+
# Clean up
132166
yay -Sccc "${pacman_args[@]}"
133167

134168
# remove user and file

‎system/pkgbuild.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set -e
1111
build_username="pkgbuild"
1212
pacman_debug=false
1313
pacman_args=()
14+
remove_list=()
1415

1516
_help() {
1617
echo "usage ${0} [option]"
@@ -99,8 +100,8 @@ readarray -t pkgbuild_dirs < <(ls "${pkgbuild_dir}" 2> /dev/null)
99100
if (( "${#pkgbuild_dirs[@]}" != 0 )); then
100101
for _dir in "${pkgbuild_dirs[@]}"; do
101102
cd "${_dir}"
102-
readarray depends < <(source "${pkgbuild_dir}/${_dir}/PKGBUILD"; echo "${depends[@]}")
103-
readarray makedepends < <(source "${pkgbuild_dir}/${_dir}/PKGBUILD"; echo "${makedepends[@]}")
103+
readarray -t depends < <(source "${pkgbuild_dir}/${_dir}/PKGBUILD"; printf "%s\n" "${depends[@]}")
104+
readarray -t makedepends < <(source "${pkgbuild_dir}/${_dir}/PKGBUILD"; printf "%s\n" "${makedepends[@]}")
104105
if (( ${#depends[@]} + ${#makedepends[@]} != 0 )); then
105106
for _pkg in "${depends[@]}" "${makedepends[@]}"; do
106107
if pacman -Ssq "${_pkg}" | grep -x "${_pkg}" 1> /dev/null; then
@@ -116,9 +117,9 @@ if (( "${#pkgbuild_dirs[@]}" != 0 )); then
116117
done
117118
fi
118119

119-
if readarray deletepkg < <(pacman -Qtdq) && (( "${#deletepkg[@]}" != 0 )); then
120-
pacman -Rsnc "${deletepkg[@]}" "${pacman_args[@]}"
121-
fi
120+
121+
readarray -t -O "${#remove_list[@]}" remove_list < <(pacman -Qtdq)
122+
(( "${#remove_list[@]}" != 0 )) && pacman -Rsnc "${remove_list[@]}" "${pacman_args[@]}"
122123

123124
pacman -Sccc "${pacman_args[@]}"
124125

‎tools/pkglist.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ set +e
162162

163163
get_filelist(){
164164
if [[ -d "${1}" ]]; then
165-
find "${1}" -mindepth 1 -name "*.${arch}" -typr f -or -type l 2> /dev/null
165+
find "${1}" -mindepth 1 -name "*.${arch}" -type f -or -type l 2> /dev/null
166166
fi
167167
}
168168

@@ -190,8 +190,8 @@ fi
190190

191191
# memtest86 package list
192192
if [[ "${memtest86}" = true ]]; then
193-
#readarray -t -O "${#_loadfilelist[@]}" _loadfilelist <(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
194-
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist <(get_filelist "${channel_dir}/${pkgdir_name}.${arch}/memtest86")
193+
#readarray -t -O "${#_loadfilelist[@]}" _loadfilelist < <(ls ${channel_dir}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null)
194+
readarray -t -O "${#_loadfilelist[@]}" _loadfilelist < <(get_filelist "${channel_dir}/${pkgdir_name}.${arch}/memtest86")
195195

196196
for_module '_loadfilelist+=($(ls ${module_dir}/{}/${pkgdir_name}.${arch}/memtest86/*.${arch} 2> /dev/null))'
197197
fi
@@ -229,7 +229,7 @@ fi
229229

230230
#-- パッケージリストをソートし重複を削除 --#
231231
#_pkglist=($(printf "%s\n" "${_pkglist[@]}" | sort | uniq | tr "\n" " "))
232-
readarray -t _pkglist < <(printf "%s\n" "${_pkglist[@]}" | sort | uniq | tr -d "\n")
232+
readarray -t _pkglist < <(printf "%s\n" "${_pkglist[@]}" | sort | uniq | grep -v ^$)
233233

234234
#-- excludeに記述されたパッケージを除外 --#
235235
for _pkg in "${_excludelist[@]}"; do

‎tools/umount.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ msg_common(){
4242
[[ "${1}" = "-n" ]] && _msg_opts+=("-o" "-n") && shift 1
4343
[[ "${nocolor}" = true ]] && _msg_opts+=("-n")
4444
_msg_opts+=("${_type}" "${@}")
45-
"${tools_dir}/msg.sh" "${_msg_opts[@]}"
45+
"${tools_dir}/msg.sh" "${_msg_opts[@]}" &
4646
}
4747

4848
# Show an INFO message

0 commit comments

Comments
 (0)
Please sign in to comment.