Merge branch 'dev' into dev-stable

Author: Hayao0819

docs/en/SOFTWARE.md

@@ -11,9 +11,10 @@ If you need a binary file, access [the Alter Linux repository](https://xn--d-8o2
 
 Source code | PKGBUILD
 --- | ---
- [alterlinux-calamares](https://github.com/FascodeNet/alterlinux-calamares) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-calamares)
-[alterlinux-fcitx-conf](https://github.com/FascodeNet/alterlinux-fcitx-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-fcitx-conf)
-[alterlinux-keyring](https://github.com/FascodeNet/alterlinux-keyring) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-keyring)
-[alterlinux-mirrorlist](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-mirrorlist) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-mirrorlist)
-[alterlinux-wallpapers](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-wallpapers) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-wallpapers)
-[alterlinux-xfce-conf](https://github.com/FascodeNet/alterlinux-xfce-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-xfce-conf)
+[alterlinux-calamares](https://github.com/FascodeNet/alterlinux-calamares) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-calamares)
+[alterlinux-fcitx-conf](https://github.com/FascodeNet/alterlinux-fcitx-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-fcitx-conf)
+[alterlinux-keyring](https://github.com/FascodeNet/alterlinux-keyring) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-keyring)
+[alterlinux-live-tools](https://github.com/FascodeNet/alterlinux-live-tools) | 
+[alterlinux-mirrorlist](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-mirrorlist) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-mirrorlist)
+[alterlinux-wallpapers](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-wallpapers) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-wallpapers)
+[alterlinux-xfce-conf](https://github.com/FascodeNet/alterlinux-xfce-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-xfce-conf)

docs/jp/SOFTWARE.md

@@ -13,9 +13,10 @@ Alter Linuxのリポジトリを使用する場合は鍵を追加する必要が
 
 ソースコード | PKGBUILD
 --- | ---
- [alterlinux-calamares](https://github.com/FascodeNet/alterlinux-calamares) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-calamares)
-[alterlinux-fcitx-conf](https://github.com/FascodeNet/alterlinux-fcitx-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-fcitx-conf)
-[alterlinux-keyring](https://github.com/FascodeNet/alterlinux-keyring) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-keyring)
-[alterlinux-mirrorlist](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-mirrorlist) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-mirrorlist)
-[alterlinux-wallpapers](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-wallpapers) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-wallpapers)
-[alterlinux-xfce-conf](https://github.com/FascodeNet/alterlinux-xfce-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/stable/alterlinux-xfce-conf)
+[alterlinux-calamares](https://github.com/FascodeNet/alterlinux-calamares) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-calamares)
+[alterlinux-fcitx-conf](https://github.com/FascodeNet/alterlinux-fcitx-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-fcitx-conf)
+[alterlinux-keyring](https://github.com/FascodeNet/alterlinux-keyring) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-keyring)
+[alterlinux-live-tools](https://github.com/FascodeNet/alterlinux-live-tools) | 
+[alterlinux-mirrorlist](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-mirrorlist) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-mirrorlist)
+[alterlinux-wallpapers](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-wallpapers) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-wallpapers)
+[alterlinux-xfce-conf](https://github.com/FascodeNet/alterlinux-xfce-conf) | [PKGBUILD](https://github.com/FascodeNet/alterlinux-pkgbuilds/tree/master/alter-stable/x86_64/alterlinux-xfce-conf)

fullbuild.sh

@@ -184,6 +184,7 @@ _help() {
     echo
     echo " General options:"
     echo "    -a <options>       Set other options in build.sh"
+    echo "    -c                 Build all channel (DO NOT specify the channel !!)"
     echo "    -d                 Use the default build.sh arguments. (${default_options})"
     echo "    -g                 Use gitversion."
     echo "    -h                 This help message."
@@ -206,9 +207,10 @@ _help() {
 share_options="--noconfirm"
 default_options="-b -l -u alter -p alter"
 
-while getopts 'a:dghr:s' arg; do
+while getopts 'a:dghr:sc' arg; do
     case "${arg}" in
         a) share_options="${share_options} ${OPTARG}" ;;
+        c) all_channel=true ;;
         d) share_options="${share_options} ${default_options}" ;;
         m) architectures=(${OPTARG}) ;;
         g) 
@@ -227,7 +229,14 @@ while getopts 'a:dghr:s' arg; do
 done
 shift $((OPTIND - 1))
 
-if [[ -n "${*}" ]]; then
+
+if [[ "${all_channel}" = true  ]]; then
+    if [[ -n "${*}" ]]; then
+        _msg_error "Do not specify the channel." "1"
+    else
+        channnels=($("${script_path}/build.sh" --channellist))
+    fi
+elif [[ -n "${*}" ]]; then
     channnels=(${@})
 fi