Merge pull request 's6: use s6-rc-bundle-update to add services' (#40) from Dudemanguy/artools:master into master

Reviewed-on: artix/artools#40

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.19
+VERSION=0.21
 
 CHROOT_VERSION=0.10
 
@@ -59,7 +59,8 @@ LN_COMMITPKG = \
 	multilib-testingpkg \
 	multilib-stagingpkg \
 	kde-unstablepkg \
-	gnome-unstablepkg
+	gnome-unstablepkg \
+	rebuildpkg
 
 LN_BUILDPKG = \
 	buildpkg-system \
@@ -95,7 +96,8 @@ PKG_LIBS = \
 PKG_UTIL = lib/util-pkg.sh
 
 PKG_DATA = \
-	data/pacman/makepkg.conf
+	data/pacman/makepkg.conf \
+	data/valid-names.conf
 
 PATCHES = \
 	$(wildcard data/patches/*.patch)

bin/pkg/batchpkg.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-19 artoo@artixlinux.org
+# Copyright (C) 2018-20 artoo@artixlinux.org
 # Copyright (C) 2018 Artix Linux Developers
 #
 # This program is free software; you can redistribute it and/or modify
@@ -33,34 +33,66 @@ batch_move() {
     done < $pkglist
 }
 
-# batch_upgrade() {
+batch_create() {
-#     local pkglist=${TREE_DIR_ARTIX}/pkg_upgrades.list
+    local name="${1:-pkg_create}"
-#     [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+    local pkglist=${TREE_DIR_ARTIX}/$name.list
-#     while read entry;do
+    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
-#         local pkg=${entry#*:}
+    while read entry;do
-#         local dest=${entry%:*}
+        local pkg=${entry##*:}
-#         echo "buildtree -i -p ${pkg}"
+        local group=${entry%:*}
-#         echo "${dest}pkg -u -p ${pkg}"
+        group=${group#*:}
-#     done < $pkglist
+        local team=${entry%%:*}
-# }
+        if ${runlist}; then
+            buildtree -n -p "${pkg}" -t "${team}" -g "${group}"
+            buildtree -i -p "${pkg}"
+            commitpkg -p "${pkg}"
+        else
+            msg "%s" "buildtree -n -p ${pkg} -t ${team} -g ${group}"
+            msg2 "%s" "buildtree -i -p ${pkg}"
+            msg2 "%s" "commitpkg -p ${pkg}"
+        fi
+    done < $pkglist
+}
+
+batch_update() {
+    local name="${1:-pkg_upgrades}"
+    local pkglist=${TREE_DIR_ARTIX}/$name.list
+    [[ -f $pkglist ]] || die "%s does not exist!" "$pkglist"
+    while read entry;do
+        local pkg=${entry#*:}
+        local dest=${entry%:*}
+        if ${runlist}; then
+            buildtree -i -p "${pkg}"
+            "${dest}"pkg -u -p "${pkg}"
+        else
+            msg "buildtree -i -p ${pkg}"
+            msg2 "${dest}pkg -u -p ${pkg}"
+        fi
+    done < $pkglist
+}
 
 usage() {
     echo "Usage: ${0##*/} [optional listname]"
     echo '    -r                 Run generated commands'
+    echo '    -c                 Create subrepos from list'
+    echo '    -u                 Update subrepos from list'
     echo '    -h                 This help'
     echo ''
     echo ''
     exit $1
 }
 
-movelistname=pkg_moves
 runlist=false
+create=false
+update=false
 
-opts='rh'
+opts='rcuh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         r) runlist=true ;;
+        c) create=true ;;
+        u) update=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -68,6 +100,12 @@ done
 
 shift $(($OPTIND - 1))
 
-movelistname="$1"; shift
+listname="$1"; shift
 
-batch_move "$movelistname"
+if ${create};then
+    batch_create "${listname}"
+elif ${update};then
+    batch_update "${listname}"
+else
+    batch_move "${listname}"
+fi

bin/pkg/buildtree.in

@@ -55,7 +55,7 @@ patch_pkg(){
 
 pull_tree_arch(){
     cd ${TREE_DIR_ARCH}
-    for tree in ${TREE_NAMES_ARCH[@]};do
+    for tree in ${ARCH_TREE[@]};do
         if [[ -d ${tree} ]];then
             cd ${tree}
             pull_tree "${tree}" "$(get_local_head)" "Arch"
@@ -94,15 +94,13 @@ show_deps(){
 
     . $src/PKGBUILD 2>/dev/null
 
-    [[ $arch == 'any' ]] && CARCH=any
-
     local archver=$(get_full_version)
 
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
     msg2 "pkgname: %s" "${pkgname[*]}"
     [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
     msg2 "Arch Version: %s" "$archver"
-    msg2 "arch: %s" "$CARCH"
+    msg2 "arch: %s" "$arch"
 
     [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
     [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
@@ -133,7 +131,7 @@ from_arch(){
     [[ -z $srcpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
 
     local repo=$(find_repo "$srcpath")
-    msg "repo: %s" "$repo"
+    msg "repo: %s" "${repo#*/}"
 
     local archpath=$srcpath/$repo
     local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
@@ -157,7 +155,7 @@ view_build(){
     [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
     local repo=$(find_repo "${archpath}")
     archpath=$archpath/$repo
-    msg2 "repo: %s" "$repo"
+    msg "repo: %s" "${repo#*/}"
     show_deps "$archpath"
 }
 
@@ -178,7 +176,7 @@ sync_repos(){
         if ${sync_group}; then
             pull_tree_artix "${GROUP}"
         else
-            pull_tree_artix "${TREE_NAMES_ARTIX[*]}"
+            pull_tree_artix "${ARTIX_TREE[*]}"
         fi
     fi
 }
@@ -201,7 +199,7 @@ check=false
 PACKAGE=''
 
 TEAM='community'
-GROUP=${TREE_NAMES_ARTIX[0]}
+GROUP=${ARTIX_TREE[0]}
 
 usage() {
     echo "Usage: ${0##*/} [options]"

bin/pkg/commitpkg.in

@@ -22,20 +22,11 @@ prepare_commit(){
         msg "Switching to new layout ..."
         [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
 
-        if [[ -d repos/"${REPO_SRC}-$CARCH" ]] || [[ -d repos/"${REPO_SRC}"-any ]]; then
+        for r in $(ls repos); do
-            mkdir "$CARCH/${REPO_SRC}"
+            mkdir "$CARCH/${r%-*}"
-            local old_src="${REPO_SRC}-$CARCH"
+            cp repos/"${r}"/* "$CARCH/${r%-*}/"
-            [[ "$arch" == any ]] && old_src="${REPO_SRC}"-any
+            git add "$CARCH/${r%-*}"
-            cp repos/"$old_src"/* "$CARCH/${REPO_SRC}"/
+        done
-            git add $CARCH/${REPO_SRC}
-        fi
-        if [[ -d repos/"${REPO_DEST}-$CARCH" ]] || [[ -d repos/"${REPO_DEST}"-any ]]; then
-            mkdir "$CARCH/${REPO_DEST}"
-            local old_dest="${REPO_DEST}-$CARCH"
-            [[ "$arch" == any ]] && old_dest="${REPO_DEST}"-any
-            cp repos/"$old_dest"/* "$CARCH/${REPO_DEST}"/
-            git add $CARCH/${REPO_DEST}
-        fi
 
         git rm -r repos
         git commit -m "switch to new repo layout"
@@ -49,6 +40,16 @@ prepare_commit(){
     fi
 }
 
+check_rebuild(){
+    if [[ -d "$CARCH"/rebuild ]] && [[ "${REPO_DEST}" == 'staging' ]]; then
+        git rm -r "$CARCH"/rebuild
+        git commit -m "switch from rebuild to staging"
+    elif [[ -d "$CARCH"/staging ]] && [[ "${REPO_DEST}" == 'rebuild' ]]; then
+        git rm -r "$CARCH"/staging
+        git commit -m "switch from staging to rebuild"
+    fi
+}
+
 check_team(){
     if [[ "${REPO_SRC}" == "core" && "${REPO_DEST}" == "extra" ]] || \
         [[ "${REPO_SRC}" == "extra" && "${REPO_DEST}" == "core" ]] || \
@@ -97,7 +98,10 @@ commit_pkg() {
 repo_commit_pkg() {
     if [[ "${REPO_SRC}" == 'trunk' ]];then
         action='add'
+
         prepare_commit
+        check_rebuild
+
         cp trunk/* "$CARCH/${REPO_DEST}"/
     else
         action='move'
@@ -150,10 +154,15 @@ run(){
 }
 
 is_valid_repo(){
-    case "${REPO_SRC}" in
+    . "${DATADIR}"/valid-names.conf
-        core|extra|community|multilib|testing|community-testing|multilib-testing|staging|community-staging|multilib-staging|gnome-unstable|kde-unstable|trunk) return 0 ;;
+    local _valid=trunk
+    for repo in ${valid_names[@]}; do
+        _valid=${repo:-}${repo:+|}$_valid
+    done
+    eval "case ${REPO_SRC} in
+        ${_valid}) return 0 ;;
         *) return 1 ;;
-    esac
+    esac"
 }
 
 load_makepkg_config

bin/pkg/comparepkg.in

@@ -19,7 +19,7 @@ prepare_artools
 get_import_path(){
     local pkg="$1" import_path=
 
-    for tree in ${TREE_NAMES_ARCH[@]};do
+    for tree in ${ARCH_TREE[@]};do
         [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && import_path=${TREE_DIR_ARCH}/$tree/$pkg
     done
     echo $import_path
@@ -27,17 +27,18 @@ get_import_path(){
 
 compare_m(){
     local result=$(vercmp "$artixver" "$archver")
-    if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
+    case ${artixrepo} in
-        if [[ "$archrepo" == "$artixrepo"  ]]; then
+        *testing*|*staging*|*rebuild)
-            msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
-        else
+                msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-            msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            else
-            if [[ -n "$archrepo" ]]; then
+                msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
-                printf "%s\n" "${a}:${b}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_moves.list
+                if [[ -n "$archrepo" ]]; then
+                    printf "%s\n" "${a}:${b}:$pkg" >> ${TREE_DIR_ARTIX}/pkg_moves.list
+                fi
             fi
-        fi
+        ;;
-
+    esac
-    fi
 }
 
 compare_u(){
@@ -65,7 +66,7 @@ pre_compare(){
     local artixrepo=$(find_repo "$pkgpath")
     local pkgbuild=$pkgpath/$artixrepo/PKGBUILD
 
-    if [[ -f $pkgbuild ]];then
+    if [[ -f $pkgbuild ]]; then
         . $pkgbuild 2>/dev/null
         local artixver=$(get_full_version)
 
@@ -78,7 +79,7 @@ pre_compare(){
 
         [[ "$node" != "$CARCH" ]] && b=${b%-*}
 
-        if [[ -f "$pkgbuild" ]];then
+        if [[ -f "$pkgbuild" ]]; then
             . $pkgbuild 2>/dev/null
             local archver=$(get_full_version)
         fi
@@ -106,7 +107,7 @@ compare_move(){
 
 tree_loop(){
     local func="$1"
-    for tree in ${TREE_NAMES_ARTIX[@]};do
+    for tree in ${ARTIX_TREE[@]}; do
         local pkgs=$(find ${TREE_DIR_ARTIX}/$tree -name trunk)
         for package in ${pkgs[@]}; do
             "$func" "$package"
@@ -151,7 +152,7 @@ update_db_cache(){
 query_db() {
     for repo in "${searchrepos[@]}"; do
         local prefix=
-        local db=${db_cache_dir}/${LINKSDBEXT}/${ARCH}/${repo}/
+        local db=${db_cache_dir}/${LINKSDBEXT}/${CARCH}/${repo}/
         if [[ -d ${db} ]]; then
             while read -rd '' pkg; do
                 read -r match
@@ -178,46 +179,25 @@ is_db_entry() {
     return 1
 }
 
-check_pkg_in_db() {
-    . $pkgbuild 2>/dev/null
-    local artixver=$(get_full_version)
-    local is_entry=false
-    for name in ${pkgname[@]};do
-
-        if is_db_entry "$name-$artixver" "$repo";then
-            is_entry=true
-        fi
-        if ! $is_entry;then
-            msg_row "${tableU}" "$repo" "$name" "$artixver" "$is_entry"
-        fi
-
-    done
-    unset artixver is_entry pkgbuild pkgver epoch pkgname pkgbase
-}
-
-check_new() {
-    local func="$1"
-    local pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-    "$func"
-}
-
-check_old() {
-    local func="$1"
-    for a in any ${CARCH};do
-        local pkgbuild=$pkgpath/repos/$repo-$a/PKGBUILD
-        "$func"
-    done
-}
-
 check_db(){
     local pkgpath="${1%/*}"
 
     for repo in ${!REPOS[@]};do
-        if [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]]; then
+        local pkgbuild=
-            check_new "check_pkg_in_db"
+        [[ -f $pkgpath/$CARCH/$repo/PKGBUILD ]] && pkgbuild=$pkgpath/$CARCH/$repo/PKGBUILD
-        else
+        [[ -f $pkgpath/repos/$repo-$CARCH/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-$CARCH/PKGBUILD
-            check_old "check_pkg_in_db"
+        [[ -f $pkgpath/repos/$repo-any/PKGBUILD ]] && pkgbuild=$pkgpath/repos/$repo-any/PKGBUILD
-        fi
+
+        . $pkgbuild 2>/dev/null
+        local artixver=$(get_full_version)
+        for name in ${pkgname[@]};do
+
+            if ! is_db_entry "$name-$artixver" "$repo"; then
+                msg_row "${tableU}" "$repo" "$name" "$artixver" "false"
+            fi
+
+        done
+        unset artixver pkgbuild pkgver epoch pkgname pkgbase
     done
 }
 

bin/pkg/deploypkg.in

@@ -86,7 +86,7 @@ passfiles="$@"
 
 prepare_dir "${REPOS_ROOT}"
 
-repo_path=${REPOS_ROOT}/${dest_repo}/os/${ARCH}
+repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
 
 if [[ -n ${passfiles[@]} ]]; then
     if ${add_pkg}; then

bin/pkg/pkg2yaml.in

@@ -101,6 +101,7 @@ yaml_write_package() {
 
 yaml_write_fileinfo(){
     local version=$(get_full_version)
+    pkgbase=${pkgbase:-$pkgname}
     Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
     Yaml+=$(write_empty_line)
     local pkgfile=$(print_all_package_names)

data/conf/artools-pkg.conf

@@ -9,32 +9,28 @@
 
 # TREE_DIR_ARTIX=${WORKSPACE_DIR}/artixlinux
 
-# customize buildtree, packages and community should be enabled
+# customize buildtree; uncomment to include
 # TREE_NAMES_ARTIX=(
-#         packages
-#         community
 #         packages-kernel
-#         packages-net
-#         packages-gfx
 #         packages-openrc
 #         packages-runit
 #         packages-s6
-#         packages-media
-#         packages-xorg
 #         packages-python
 #         packages-perl
 #         packages-java
-#         packages-qt5
-#         packages-devel
 #         packages-ruby
-#         packages-gtk
+#         packages-kf5
+#         packages-plasma
+#         packages-kde
 #         packages-gnome
 #         packages-cinnamon
 #         packages-lxqt
 #         packages-mate
-#         packages-kde
 #         packages-xfce
 #         packages-wm
+#         packages-devel
+#         packages-lib32
+#         packages-qt6
 # )
 
 # HOST_TREE_ARCH=git://git.archlinux.org/svntogit

data/pacman/pacman-default.conf

@@ -97,25 +97,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-gnome-wobble.conf

@@ -109,37 +109,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-staging]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-goblins.conf

@@ -106,34 +106,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-staging]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-gremlins.conf

@@ -97,25 +97,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-kde-wobble.conf

@@ -109,37 +109,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-staging]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32-goblins.conf

@@ -106,34 +106,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib-staging]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32-gremlins.conf

@@ -97,25 +97,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib-testing]
-Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist-arch

data/pacman/pacman-lib32.conf

@@ -97,25 +97,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
-#
-# ARCHLINUX
-#
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-[community]
-Include = /etc/pacman.d/mirrorlist-arch
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist-arch
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist-arch

data/valid-names.conf

@@ -0,0 +1,40 @@
+valid_names=(
+    core
+    extra
+    community
+    multilib
+    testing
+    community-testing
+    multilib-testing
+    staging
+    community-staging
+    multilib-staging
+    rebuild
+    gnome-unstable
+    kde-unstable
+)
+
+stable=(
+    ${valid_names[0]}
+    ${valid_names[1]}
+    ${valid_names[2]}
+    ${valid_names[3]}
+)
+
+gremlins=(
+    ${valid_names[4]}
+    ${valid_names[5]}
+    ${valid_names[6]}
+)
+
+goblins=(
+    ${valid_names[7]}
+    ${valid_names[8]}
+    ${valid_names[9]}
+    ${valid_names[10]}
+)
+
+unstable=(
+    ${valid_names[11]}
+    ${valid_names[12]}
+)

lib/iso/chrootcfg.sh

@@ -34,16 +34,15 @@ add_svc_runit(){
 }
 
 add_svc_s6(){
-    local mnt="$1" names="$2" valid="" rlvl="${3:-default}"
+    local mnt="$1" names="$2" rlvl="${3:-default}"
     for svc in $names; do
         error=false
         chroot $mnt s6-rc-db -c /etc/s6/rc/compiled type $svc &> /dev/null || error=true
         if [ $? == 0 ] && [[ $error == false ]]; then
             msg2 "Setting %s ..." "$svc"
-            valid=${valid:-}${valid:+' '}${svc}
+            chroot $mnt s6-rc-bundle-update -c /etc/s6/rc/compiled add $rlvl $svc
         fi
     done
-    chroot $mnt s6-rc-bundle -c /etc/s6/rc/compiled add $rlvl $valid
 
     # rebuild s6-linux-init binaries
     chroot $mnt rm -r /etc/s6/current

lib/iso/grub.sh

@@ -15,9 +15,8 @@
 prepare_boot_extras(){
     local src="$1" dest=${iso_root}/boot
 
-    for u in intel amd;do
+    for fw in intel amd; do
-        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/boot/$fw-ucode.img $dest/$fw-ucode.img
-        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
     done
 
     cp $src/boot/memtest86+/memtest.bin $dest/memtest

lib/pkg/git.sh

@@ -103,83 +103,3 @@ config_tree(){
         fi
     cd ..
 }
-
-# write_gitignore() {
-#     local pkg="$1"
-#     local gitignore=$pkg/.gitignore
-#     echo '# ---> ArchLinuxPackages' > $gitignore
-#     echo '*.tar' >> $gitignore
-#     echo '*.tar.*' >> $gitignore
-#     echo '*.jar' >> $gitignore
-#     echo '*.exe' >> $gitignore
-#     echo '*.msi' >> $gitignore
-#     echo '*.zip' >> $gitignore
-#     echo '*.tgz' >> $gitignore
-#     echo '*.log' >> $gitignore
-#     echo '*.log.*' >> $gitignore
-#     echo '*.sig' >> $gitignore
-#     echo '' >> $gitignore
-#     echo 'pkg/' >> $gitignore
-#     echo 'src/' >> $gitignore
-#     echo '' >> $gitignore
-#     echo '# ---> Archives' >> $gitignore
-#     echo '*.7z' >> $gitignore
-#     echo '*.rar' >> $gitignore
-#     echo '*.gz' >> $gitignore
-#     echo '*.bzip' >> $gitignore
-#     echo '*.bz2' >> $gitignore
-#     echo '*.xz' >> $gitignore
-#     echo '*.lzma' >> $gitignore
-#     echo '*.cab' >> $gitignore
-#     echo '' >> $gitignore
-#     echo '# ---> systemd' >> $gitignore
-#     echo '*.service' >> $gitignore
-#     echo '*.socket' >> $gitignore
-#     echo '*.timer' >> $gitignore
-#     echo '' >> $gitignore
-#     echo '# ---> snap' >> $gitignore
-#     echo '*.snap' >> $gitignore
-#     echo '' >> $gitignore
-#
-#     git add $gitignore
-# }
-#
-# write_readme(){
-#     local pkg="$1"
-#     local readme=$pkg/README.md
-#
-#     echo "# $pkg" > $readme
-#     echo '' >> $readme
-#
-#     git add $readme
-# }
-#
-# subrepo_new2(){
-#     local group="${1:-$GROUP}" team="${2:-$TEAM}"
-#     local dest=${TREE_DIR_ARTIX}/$group/${PACKAGE}/trunk
-#
-#     cd ${TREE_DIR_ARTIX}/$group
-#
-#     local org=$(get_pkg_org "${PACKAGE}")
-#
-#     prepare_dir "$dest"
-#
-#     subrepo_init "${PACKAGE}" "$org"
-#
-#     commit_jenkins_files2 "${PACKAGE}"
-#
-#     subrepo_push "${PACKAGE}"
-#
-#     add_repo_to_team "${PACKAGE}" "$org" "$team"
-# }
-#
-# commit_jenkins_files2(){
-#     local pkg="$1"
-#
-#     write_jenkinsfile "$pkg"
-#     write_agentyaml "$pkg"
-#     write_readme "$pkg"
-#     write_gitignore "$pkg"
-#
-#     git commit -m "initial commit"
-# }

lib/pkg/util.sh

@@ -17,18 +17,21 @@ shopt -s extglob
 get_compliant_name(){
     local gitname="$1"
     case "$gitname" in
-        *+) gitname=${gitname//+/plus}
+        *+) gitname=${gitname//+/plus} ;;
+        *+*) gitname=${gitname//+/-} ;;
     esac
     echo "$gitname"
 }
 
 set_arch_repos(){
     local x="$1" y="$2" z="$3"
-    ARCH_REPOS=(core extra community multilib)
+    . "${DATADIR}"/valid-names.conf
 
-    $x && ARCH_REPOS+=(testing community-testing multilib-testing)
+    ARCH_REPOS=(${stable[@]})
-    $y && ARCH_REPOS+=(staging community-staging multilib-staging)
+
-    $z && ARCH_REPOS+=(gnome-unstable kde-unstable)
+    $x && ARCH_REPOS+=(${gremlins[@]})
+    $y && ARCH_REPOS+=(${goblins[@]})
+    $z && ARCH_REPOS+=(${unstable[@]})
 }
 
 find_repo(){

lib/util-pkg.sh.in

@@ -36,39 +36,37 @@ load_pkg_config(){
 
     TREE_DIR_ARTIX=${TREE_DIR_ARTIX:-"${WORKSPACE_DIR}/artixlinux"}
 
+    ARTIX_TREE=(
+        packages community
+        packages-{gfx,gtk,media,net,qt5,xorg}
+    )
+
+    local dev_tree=(packages-{python,perl,java,ruby})
+
+    local init_tree=(packages-{openrc,runit,s6})
+
+    local desktop_tree=(
+        packages-{kf5,plasma,kde,qt6}
+        packages-{lxqt,gnome,cinnamon,mate,xfce,wm}
+    )
+
     [[ -z ${TREE_NAMES_ARTIX[@]} ]] && \
     TREE_NAMES_ARTIX=(
-            packages
+        packages-kernel
-            community
+        "${init_tree[@]}"
-            packages-kernel
+        "${dev_tree[@]}"
-            packages-net
+        "${desktop_tree[@]}"
-            packages-gfx
+        packages-devel
-            packages-openrc
+        packages-lib32
-            packages-runit
-            packages-s6
-            packages-xorg
-            packages-python
-            packages-perl
-            packages-java
-            packages-qt5
-            packages-devel
-            packages-ruby
-            packages-gtk
-            packages-gnome
-            packages-cinnamon
-            packages-lxqt
-            packages-mate
-            packages-kde
-            packages-xfce
-            packages-wm
-#             packages-haskell
     )
 
+    ARTIX_TREE+=("${TREE_NAMES_ARTIX[@]}")
+
     HOST_TREE_ARTIX=${HOST_TREE_ARTIX:-"gitea@${GIT_DOMAIN}:artixlinux"}
 
     TREE_DIR_ARCH=${TREE_DIR_ARCH:-"${WORKSPACE_DIR}/archlinux"}
 
-    TREE_NAMES_ARCH=(packages community)
+    ARCH_TREE=(packages community)
 
     HOST_TREE_ARCH=${HOST_TREE_ARCH:-'git://git.archlinux.org/svntogit'}