remove useless param in get_full_version() calls

bin/pkg/buildtree.in

@@ -58,7 +58,7 @@ show_deps(){
 
     [[ $arch == 'any' ]] && CARCH=any
 
-    local archver=$(get_full_version $pkg)
+    local archver=$(get_full_version)
 
     msg2 "repo: %s" "$repo"
     [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
@@ -74,19 +74,22 @@ show_deps(){
 }
 
 from_arch(){
-    local pkg="$1" src= dest=
+    local src= dest=
-    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
-    local package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    cd ${TREE_DIR_ARTIX}
+
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+
+    local package=${TREE_DIR_ARCH}/$git_tree_arch/${PACKAGE}
     local repo=$(find_repo "$package" "${staging}" "${unstable}")
 
     src=$package/repos/$repo
 
-    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "$pkg")
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
-    local tree_dir=$(get_artix_tree "$pkg" "$git_tree_artix" "$git_tree_arch")
+    local tree_dir=$(get_artix_tree "${PACKAGE}" "$git_tree_artix" "$git_tree_arch")
 
-    dest=${TREE_DIR_ARTIX}/$tree_dir/$pkg/trunk
+    dest=${TREE_DIR_ARTIX}/$tree_dir/${PACKAGE}/trunk
 
     msg "tree: %s" "$tree_dir"
     show_deps "$src" "$repo"
@@ -96,25 +99,25 @@ from_arch(){
         cd ${TREE_DIR_ARTIX}/$git_tree_artix
 
         . $dest/PKGBUILD 2>/dev/null
-        local artixver=$(get_full_version $pkg)
+        local artixver=$(get_full_version)
 
         msg2 "Artix Version: %s" "$artixver"
     else
-        subrepo_new "$pkg" "$tree_dir" "$git_tree_arch"
+        subrepo_new "${PACKAGE}" "$tree_dir" "$git_tree_arch"
     fi
 
-    msg "Sync (%s) from [%s] to [%s]" "$pkg" "$git_tree_arch" "$tree_dir"
+    msg "Sync (%s) from [%s] to [%s]" "${PACKAGE}" "$git_tree_arch" "$tree_dir"
 
     sync_pkg "$src" "$dest"
-    patch_pkg "$pkg"
+    patch_pkg "${PACKAGE}"
 }
 
 view_build(){
-    local pkg="$1" src=
+    local src=
-    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
-    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
 
-    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/${PACKAGE}
     local repo=$(find_repo "$pkg_path" "${staging}" "${unstable}")
 
     src=$pkg_path/repos/$repo
@@ -122,6 +125,16 @@ view_build(){
     show_deps "$src" "$repo"
 }
 
+check_tree(){
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "${PACKAGE}")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "${PACKAGE}"
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
+    local tree_dir=$(get_artix_tree "${PACKAGE}" "$git_tree_artix" "$git_tree_arch")
+    msg "tree_dir: %s" "$tree_dir"
+    [[ -z $git_tree_artix ]] && msg2 "exists: %s" "no"
+    [[ -n $git_tree_artix ]] && msg2 "exists: %s" "yes"
+}
+
 sync_repos(){
     ${sync_arch} && pull_tree_arch
     if ${sync_artix};then
@@ -133,6 +146,25 @@ sync_repos(){
     fi
 }
 
+
+subrepo_new(){
+    local dest=${TREE_DIR_ARTIX}/${GROUP}/${PACKAGE}/trunk
+
+    cd ${TREE_DIR_ARTIX}/${GROUP}
+
+    local org=$(get_pkg_org "${PACKAGE}")
+
+    create_repo "${PACKAGE}" "$org"
+
+    add_repo_to_team "${PACKAGE}" "$org" "${TEAM:-$GROUP}"
+
+    subrepo_clone "${PACKAGE}" "$org"
+
+    prepare_dir "$dest"
+
+    commit_jenkins_files "${PACKAGE}"
+}
+
 load_user_info
 
 load_config "${USERCONFDIR}/artools/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
@@ -149,6 +181,7 @@ conf=false
 unstable=false
 staging=true
 sync_group=false
+check=false
 
 PACKAGE=''
 
@@ -169,7 +202,8 @@ usage() {
     echo '    -n            Make new remote subrepo and clone it'
     echo '    -u            Include kde & gnome unstable (only with -i)'
     echo '    -w            Exclude staging (only with -i)'
-    echo '    -v            View package depends'
+    echo '    -v            Check if a package is in the artix tree(s)'
+    echo '    -c            View package depends'
     echo '    -h            This help'
     echo ''
     echo ''
@@ -178,7 +212,7 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:t:g:uwsinzyvh'
+opts='p:t:g:uwsinzycvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -192,6 +226,7 @@ while getopts "${opts}" arg; do
         n) createnew=true ;;
         w) staging=false ;;
         u) unstable=true ;;
+        c) check=true ;;
         v) view=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -205,8 +240,10 @@ prepare_dir "${TREE_DIR_ARCH}"
 
 ${sync} && sync_repos
 
-${view} && view_build "${PACKAGE}"
+${view} && view_build
 
-${import} && from_arch "${PACKAGE}"
+${check} && check_tree
 
-${createnew} && subrepo_new "${PACKAGE}" "${GROUP}" "${TEAM}"
+${import} && from_arch
+
+${createnew} && subrepo_new

bin/pkg/checkpkg.in

@@ -43,7 +43,7 @@ TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
 for _pkgname in "${pkgname[@]}"; do
     comparepkg=$_pkgname
     pkgurl=
-    target_pkgver=$(get_full_version "$_pkgname")
+    target_pkgver=$(get_full_version)
     if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
         die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
     fi

bin/pkg/comparepkg.in

@@ -18,14 +18,14 @@
 compare(){
     local pkgpath="$1" group="$2"
     local pkg=${pkgpath##*/}
-    local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
+    local artixrepo=$(find_repo "$pkgpath" "${staging}" "${unstable}")
     local artixshow=${artixrepo%-*}
     local pkgbuild=$pkgpath/repos/$artixrepo/PKGBUILD
 
     if [[ -f $pkgbuild ]];then
 
         . $pkgbuild 2>/dev/null
-        local artixver=$(get_full_version $pkg)
+        local artixver=$(get_full_version)
 
         local archpath=$(get_import_path $pkg)
 
@@ -36,7 +36,7 @@ compare(){
 
         if [[ -f $pkgbuild ]];then
             . $pkgbuild 2>/dev/null
-            local archver=$(get_full_version $pkg)
+            local archver=$(get_full_version)
         fi
 
         local result=$(vercmp "$artixver" "$archver")
@@ -101,7 +101,7 @@ check_db(){
             if [[ -f $pkgbuild ]];then
 
                 . $pkgbuild 2>/dev/null
-                local artixver=$(get_full_version $pkg)
+                local artixver=$(get_full_version)
                 local is_entry=false
 
                 for name in ${pkgname[@]};do

bin/pkg/deploypkg.in

@@ -38,6 +38,23 @@ find_cached_pkgfile() {
     esac
 }
 
+get_pkgbasename(){
+    local pkg="$1"
+    local pkgbasename name ver rel arch
+
+    pkgbasename=${pkg%.pkg.tar.?z}
+    arch=${pkgbasename##*-}
+    pkgbasename=${pkgbasename%-"$arch"}
+
+    rel=${pkgbasename##*-}
+    pkgbasename=${pkgbasename%-"$rel"}
+
+    ver=${pkgbasename##*-}
+
+    name=${pkgbasename%-"$ver"}
+    echo $name
+}
+
 update_repo2(){
     local repo="$1"
     local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
@@ -56,7 +73,7 @@ update_repo2(){
                 ln -sf ${pkgfile}{,.sig} $repo_path/
             elif ${del_pkg};then
                 local action='remove'
-                packages+=("$name")
+                packages+=("$(get_pkgbasename "$name")")
                 [[ -e $repo_path/$name ]] && rm $repo_path/$name
                 [[ -e $repo_path/$name.sig ]] && rm $repo_path/$name.sig
             fi
@@ -85,7 +102,7 @@ update_repo(){
 
     for name in ${pkgsearch[@]}; do
         pkgarch=$(get_pkg_arch "$name")
-        ver=$(get_full_version "$name")
+        ver=$(get_full_version)
         if pkgfile=$(find_cached_package "$name" "$ver" "$pkgarch");then
             local pkg=${pkgfile##*/}
             info "Found: %s" "$pkg"

bin/pkg/finddeps.in

@@ -33,17 +33,18 @@ find . -type d -print0 2>/dev/null| while read -r -d '' d; do
         for dep in "${depends[@]}"; do
             # lose the version comparator, if any
             depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && echo "$d (depends)"
+            [[ $depname = "$match" ]] && msg "$d (depends)"
         done
         for dep in "${makedepends[@]}"; do
             # lose the version comparator, if any
             depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && echo "$d (makedepends)"
+            [[ $depname = "$match" ]] && msg "$d (makedepends)"
         done
         for dep in "${optdepends[@]/:*}"; do
             # lose the version comaparator, if any
             depname=${dep%%[<>=]*}
-            [[ $depname = "$match" ]] && echo "$d (optdepends)"
+            [[ $depname = "$match" ]] && msg "$d (optdepends)"
         done
     fi
 done
+

lib/pkg/subrepo.sh

@@ -139,22 +139,3 @@ config_tree(){
         fi
     cd ..
 }
-
-subrepo_new(){
-    local pkg="$1" tree="$2" team="${3:-$2}"
-    local dest=${TREE_DIR_ARTIX}/$tree/$pkg/trunk
-
-    cd ${TREE_DIR_ARTIX}/$tree
-
-    local org=$(get_pkg_org "$pkg")
-
-    create_repo "$pkg" "$org"
-
-    add_repo_to_team "$pkg" "$org" "$team"
-
-    subrepo_clone "$pkg" "$org"
-
-    prepare_dir "$dest"
-
-    commit_jenkins_files "$pkg"
-}

lib/pkg/util.sh

@@ -109,7 +109,7 @@ find_repo(){
     local pkg="$1" stag="$2" unst="$3" repo=
 
     for r in $(arch_repos "$stag" "$unst");do
-        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-${ARCH}/PKGBUILD ]] && repo=$r-${ARCH}
         [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
     done
     echo $repo