deploypkg: add xz compat

bin/pkg/buildtree.in

@@ -113,9 +113,6 @@ show_deps(){
 subrepo_new(){
     cd ${TREE_DIR_ARTIX}/${GROUP}
 
-    msg2 "team: %s" "${TEAM}"
-    msg2 "group: %s" "${GROUP}"
-
     local org=$(get_pkg_org "${PACKAGE}")
 
     create_repo "${PACKAGE}" "$org"
@@ -139,20 +136,14 @@ from_arch(){
     msg "repo: %s" "$repo"
 
     local archpath=$srcpath/repos/$repo
-    local artixpath=$(find_pkg ${TREE_DIR_ARTIX} ${PACKAGE})
+    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
 
     show_deps "$archpath"
 
     if [[ -f "$artixpath"/.gitrepo ]]; then
-        artixpath=$artixpath/trunk
+        artixpath="$artixpath"/trunk
-
-        if [[ -f $artixpath/PKGBUILD ]];then
-
-            . $artixpath/PKGBUILD 2>/dev/null
-            local artixver=$(get_full_version)
-
-            msg2 "Artix Version: %s" "$artixver"
 
+        if [[ -d "$artixpath" ]];then
             sync_pkg "$archpath" "$artixpath"
             patch_pkg "$artixpath"
         fi
@@ -173,7 +164,7 @@ view_build(){
 check_tree(){
     local archpath=$(find_pkg "${TREE_DIR_ARCH}" "${PACKAGE}")
     [[ -z $archpath ]] && die "Package '%s' does not exist!" "${PACKAGE}"
-    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" ${PACKAGE})
+    local artixpath=$(find_pkg "${TREE_DIR_ARTIX}" "${PACKAGE}")
     local group=${artixpath%/*}
     msg "group: %s" "${group##*/}"
 

bin/pkg/deploypkg.in

@@ -34,29 +34,28 @@ get_pkgbasename(){
 }
 
 add(){
-    packages+=("$pkg")
+    packages+=("$pkg.$ext")
-    if [[ -e "${pkgfile}" ]]; then
+    action='add'
-        action='add'
+    ln -sf "${pkgfile}"{,.sig} "$repo_path"/
-        ln -sf "${pkgfile}"{,.sig} "$repo_path"/
-    fi
 }
 
 remove(){
-    packages+=("$(get_pkgbasename "$pkg")")
+    local to_remove=$(get_pkgbasename "$pkg.$ext")
-    if [[ -e "$repo_path"/"$pkg" ]]; then
+    packages+=("$to_remove")
-        action='remove'
+    action='remove'
-        rm "$repo_path"/"$pkg"
+    rm "$repo_path"/"$to_remove"*pkg.tar*
-    fi
-    [[ -e "$repo_path"/"$pkg".sig ]] && rm "$repo_path"/"$pkg".sig
 }
 
 repo_action(){
     local packages=() action= func="$1"
-    for pkg in ${passfiles[@]}; do
+    for pkgname in ${passfiles[@]}; do
-        if pkgfile=$(find_cached_pkgfile "$pkg");then
+        pkg=${pkgname%.*}
-            msg "Found: %s" "${pkgfile}"
+        for ext in zst xz;do
-            "$func"
+            if pkgfile=$(find_cached_pkgfile "$pkg.$ext");then
-        fi
+                msg "Found: %s" "${pkgfile}"
+                "$func"
+            fi
+        done
     done
     cd $repo_path
     if [[ -n "$action" ]]; then