Skip to content

Commit 37962bb

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents 51dcbab + 0f7a3ab commit 37962bb

11 files changed

Lines changed: 48 additions & 40 deletions

File tree

‎build.sh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ modules=()
2929
DEFAULT_ARGUMENT=""
3030
ARGUMENT=("${@}")
3131
alteriso_version="3.1"
32+
norepopkg=()
3233

3334
# Load config file
3435
[[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
@@ -421,13 +422,14 @@ prepare_build() {
421422
# Legacy mode
422423
if [[ "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "${channel_name}")" = "3.0" ]]; then
423424
msg_warn "The module cannot be used because it works with Alter ISO3.0 compatibility."
424-
if [[ -n "${include_extra+SET}" ]]; then
425-
if [[ "${include_extra}" = true ]]; then
426-
modules=("base" "share" "share-extra" "calamares" "zsh-powerline")
427-
else
425+
case "${include_extra-"unset"}" in
426+
"true")
427+
modules=("base" "share" "share-extra" "gtk-tools" "pamac" "calamares" "zsh-powerline")
428+
;;
429+
"false" | "unset")
428430
modules=("base" "share")
429-
fi
430-
fi
431+
;;
432+
esac
431433
fi
432434

433435
local module_check
@@ -552,20 +554,35 @@ make_basefs() {
552554
# Additional packages (airootfs)
553555
make_packages_repo() {
554556
msg_debug "pkglist.sh ${pkglist_args[*]}"
555-
readarray -t _pkglist < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
557+
readarray -t _pkglist_install < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
558+
559+
# Package check
560+
#readarray -t _pkglist < <("${tools_dir}/pkglist.sh" "${pkglist_args[@]}")
561+
#readarray -t repopkgs < <(pacman-conf -c "${build_pacman_conf}" -l | xargs -I{} pacman -Sql --config "${build_pacman_conf}" --color=never {} && pacman -Sg)
562+
#local _pkg
563+
#for _pkg in "${_pkglist[@]}"; do
564+
# msg_info "Checking ${_pkg}..."
565+
# if printf "%s\n" "${repopkgs[@]}" | grep -qx "${_pkg}"; then
566+
# _pkglist_install+=("${_pkg}")
567+
# else
568+
# msg_info "${_pkg} was not found. Install it with yay from AUR"
569+
# norepopkg+=("${_pkg}")
570+
# fi
571+
#done
556572

557573
# Create a list of packages to be finally installed as packages.list directly under the working directory.
558574
echo -e "# The list of packages that is installed in live cd.\n#\n" > "${build_dir}/packages.list"
559-
printf "%s\n" "${_pkglist[@]}" >> "${build_dir}/packages.list"
575+
printf "%s\n" "${_pkglist_install[@]}" >> "${build_dir}/packages.list"
560576

561577
# Install packages on airootfs
562-
_pacstrap "${_pkglist[@]}"
578+
_pacstrap "${_pkglist_install[@]}"
563579

564580
return 0
565581
}
566582

567583
make_packages_aur() {
568584
readarray -t _pkglist_aur < <("${tools_dir}/pkglist.sh" --aur "${pkglist_args[@]}")
585+
_pkglist_aur=("${_pkglist_aur[@]}" "${norepopkg[@]}")
569586

570587
# Create a list of packages to be finally installed as packages.list directly under the working directory.
571588
echo -e "\n# AUR packages.\n#\n" >> "${build_dir}/packages.list"
@@ -666,7 +683,7 @@ make_customize_airootfs() {
666683
# Create script
667684
for _script in "${_script_list[@]}"; do
668685
if [[ -f "${_script}" ]]; then
669-
echo -e "\n$(cat "${_script}")" >> "${airootfs_dir}/${_main_script}"
686+
(echo && cat "${_script}") >> "${airootfs_dir}/${_main_script}"
670687
remove "${_script}"
671688
else
672689
msg_debug "${_script} was not found."

‎docs/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ Please see the <a href="https://fascode.net/projects/linux/alter/">official webs
6868
<h3>Xfce</h3>
6969
<img src="../images/screenshot/desktop-xfce.png" alt="screenshot">
7070

71+
<h3>Plasma</h3>
72+
<img src="../images/screenshot/desktop-plasma.png" alt="screenshot">
73+
7174
<h3>Lxde</h3>
7275
<img src="../images/screenshot/desktop-lxde.png" alt="screenshot">
7376

‎docs/README_jp.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNe
6565
<h3>Xfce</h3>
6666
<img src="../images/screenshot/desktop-xfce.png" alt="screenshot">
6767

68+
<h3>Plasma</h3>
69+
<img src="../images/screenshot/desktop-plasma.png" alt="screenshot">
70+
6871
<h3>Lxde</h3>
6972
<img src="../images/screenshot/desktop-lxde.png" alt="screenshot">
7073

‎images/screenshot/desktop-plasma.png‎

1.24 MB
Loading

‎modules/share-extra/airootfs.i686/etc/pacman.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ LocalFileSigLevel = Optional
8080
[alter-stable]
8181
Include = /etc/pacman.d/mirrorlist-alter
8282

83-
#[alter-testing]
84-
#Include = /etc/pacman.d/mirrorlist-alter
85-
8683
#[testing]
8784
#Include = /etc/pacman.d/mirrorlist
8885
#Server = http://de.mirror.archlinux32.org/$arch/$repo/

‎modules/share-extra/airootfs.x86_64/etc/pacman.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ Include = /etc/pacman.d/mirrorlist-alter
8383
[dvzrv]
8484
Server = https://pkgbuild.com/~dvzrv/repo/$arch
8585

86-
#[alter-testing]
87-
#Include = /etc/pacman.d/mirrorlist-alter
88-
8986
#[testing]
9087
#Include = /etc/pacman.d/mirrorlist
9188

modules/share-extra/packages_aur.i686/scripts.i686 renamed to modules/share-extra/packages.i686/scripts.i686

File renamed without changes.

modules/share-extra/packages_aur.x86_64/scripts.x86_64 renamed to modules/share-extra/packages.x86_64/scripts.x86_64

File renamed without changes.

‎system/pacman-i486.conf‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,13 @@ LocalFileSigLevel = Optional
8080
# after the header, and they will be used before the default mirrors.
8181

8282
[alter-stable]
83+
Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
84+
Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
8385
Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
86+
Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
87+
Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
8488
Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
85-
Server = https://repo.dyama.net/$repo/$arch
86-
#Server = https://xn--d-8o2b.com/repo/$repo/$arch
87-
88-
#[alter-testing]
89-
#Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
90-
#Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
91-
#Server = https://repo.dyama.net/$repo/$arch
92-
#Server = https://xn--d-8o2b.com/repo/$repo/$arch
89+
Server = https://fascodenet.github.io/$repo/$arch/
9390

9491
#[testing]
9592
#Server = http://de.mirror.archlinux32.org/$arch/$repo/

‎system/pacman-i686.conf‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,13 @@ LocalFileSigLevel = Optional
8080
# after the header, and they will be used before the default mirrors.
8181

8282
[alter-stable]
83+
Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
84+
Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
8385
Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
86+
Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
87+
Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
8488
Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
85-
Server = https://repo.dyama.net/$repo/$arch
86-
#Server = https://xn--d-8o2b.com/repo/$repo/$arch
87-
88-
#[alter-testing]
89-
#Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
90-
#Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
91-
#Server = https://repo.dyama.net/$repo/$arch
92-
#Server = https://xn--d-8o2b.com/repo/$repo/$arch
89+
Server = https://fascodenet.github.io/$repo/$arch/
9390

9491
#[testing]
9592
#Server = http://de.mirror.archlinux32.org/$arch/$repo/

0 commit comments

Comments
 (0)