chroot-run: sleep 1 after killing chroot process

bin/base/chroot-run.in

@@ -32,6 +32,7 @@ kill_chroot_process(){
             fi
         fi
     done
+    sleep 1
 }
 
 # umask might have been changed in /etc/profile

bin/pkg/commitpkg.in

@@ -115,27 +115,29 @@ path_config() {
     . "$pkgbuild"
 }
 
-get_commit_msg() {
+get_repo_commit_msg() {
     echo "[${repo_src}] -> [${repo_dest}] '${package}-$(get_full_version)' ${action}"
 }
 
+get_commit_msg() {
+    echo "[${repo_src}] '${package}-$(get_full_version)' ${action}"
+}
+
 commit_pkg() {
     local commit_msg pkg
     if ${remove}; then
         action='remove'
-        commit_msg="[${repo_src}] '$pkg' ${action}"
+        commit_msg=$(get_commit_msg)
         msg "Action: %s" "$commit_msg"
         if [[ "${repo_src}" == 'trunk' ]];then
-            pkg=${package}
             git rm -r trunk
         else
-            pkg="${package}-$(get_full_version)"
             prepare_commit
             git rm -r "$CARCH/${repo_src}"
         fi
     else
         action='modify'
-        commit_msg="[${repo_src}] '${package}-$(get_full_version)' ${action}"
+        commit_msg=$(get_commit_msg)
         msg "Action: %s" "$commit_msg"
         git add .
     fi
@@ -146,7 +148,7 @@ repo_commit_pkg() {
     local commit_msg
     if [[ "${repo_src}" == 'trunk' ]]; then
         action='add'
-        commit_msg=$(get_commit_msg)
+        commit_msg=$(get_repo_commit_msg)
         msg "Action: %s" "$commit_msg"
         prepare_commit
         check_rebuild
@@ -154,7 +156,7 @@ repo_commit_pkg() {
     else
         action='move'
         [[ ! -f $pkgbuild ]] && die "%s does not exist!" "$pkgbuild"
-        commit_msg=$(get_commit_msg)
+        commit_msg=$(get_repo_commit_msg)
         msg "Action: %s" "$commit_msg"
         prepare_commit
         cp "$CARCH/${repo_src}"/* "$CARCH/${repo_dest}"/

data/conf/artools-iso.conf

@@ -8,7 +8,7 @@
 # the dist release; default: auto
 # ISO_VERSION=$(date +%Y%m%d)
 
-# possible values: openrc, runit, s6, 66
+# possible values: openrc, runit, s6, suite66
 # INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip img signing

data/conf/artools-pkg.conf

@@ -13,8 +13,8 @@
 #         packages-openrc
 #         packages-runit
 #         packages-s6
-#         packages-66
+#         packages-suite66
-#         packages-python
+#         python-world
 #         packages-perl
 #         packages-java
 #         packages-ruby
@@ -30,6 +30,10 @@
 #         packages-devel
 #         packages-lib32
 #         packages-qt6
+#         packages-office
+#         packages-misc
+#         packages-python
+#         python-galaxy
 # )
 
 # TREE_DIR_ARCH=${WORKSPACE_DIR}/archlinux

data/proto/PKGBUILD.suite66.proto

@@ -1,12 +1,12 @@
 # Maintainer: Your Name <youremail@domain.com>
 
-pkgname=NAME-66
+pkgname=NAME-suite66
 pkgver=VERSION
 pkgrel=1
 epoch=
 pkgdesc="Suite66 NAME init script"
 arch=('any')
-url="https://gitea.artixlinux.org/artixlinux/packages-66"
+url="https://gitea.artixlinux.org/artixlinux/packages-suite66"
 license=('GPL2')
 groups=()
 depends=("suite66-base" "NAME")

lib/util-pkg.sh

@@ -31,7 +31,7 @@ load_pkg_config(){
         python-{world,galaxy}
     )
 
-    local init_tree=(packages-{openrc,runit,s6,66})
+    local init_tree=(packages-{openrc,runit,s6,suite66})
 
     local desktop_tree=(
         packages-{kf5,plasma,kde,qt6}