buildtree: ensure trunk exists for newly cloned subrepos

buildtree: rm unstable flag

Makefile

@@ -41,6 +41,7 @@ BIN_PKG = \
 	bin/buildtree \
 	bin/deploypkg \
 	bin/commitpkg \
+	bin/comparepkg \
 	bin/pkg2yaml
 
 LIBS_PKG = \

bin/buildtree.in

@@ -82,85 +82,14 @@ mkrepo(){
 
     prepare_dir "$pkg_path/trunk"
 
-    cd $pkg_path
+    commit_jenkins_files "$pkg"
-    commit_jenkins_files
-}
-
-show_version_table(){
-    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
-
-    for tree in ${tree_names[@]};do
-
-        local git=$(find ${TREE_DIR_ARTIX}/$tree/ -mindepth 1 -maxdepth 1 -type d)
-
-        for package in ${git[@]}; do
-
-            local pkg=${package##*/}
-            local artixrepo=$(find_repo "$package" "${unstable}" "${staging}")
-            local artixshow=${artixrepo%-*}
-            local pkgbuild=$package/repos/$artixrepo/PKGBUILD
-
-            if [[ -f $pkgbuild ]];then
-
-                source $pkgbuild 2>/dev/null
-                local artixver=$(get_full_version $pkg)
-
-                local archpath=$(get_import_path "$pkg")
-                local archrepo=$(find_repo "$archpath" "${unstable}" "${staging}")
-                local archshow=${archrepo%-*}
-                pkgbuild=$archpath/repos/$archrepo/PKGBUILD
-
-                if [[ -f $pkgbuild ]];then
-                    source $pkgbuild 2>/dev/null
-                    local archver=$(get_full_version $pkg)
-                fi
-
-                if ${artix};then
-
-                    if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        case $artixrepo in
-                            *staging*)
-                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                                fi
-                            ;;
-                            *testing*)
-                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                                fi
-                            ;;
-                        esac
-                    fi
-
-                else
-
-                    if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
-                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                    fi
-
-                    if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
-                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
-                        fi
-                    fi
-
-                fi
-                unset pkgver epoch pkgrel artixver archver
-
-            fi
-        done
-    done
 }
 
 sync_pkg(){
     local rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
     local src="$1" dest="$2" tree="$3"
 
-    info "Sync from archlinux (%s)" "$git_tree_arch"
+    info "Sync from archlinux (%s)" "$tree"
     rsync "${rsync_args[@]}" $src/ $dest/
 }
 
@@ -193,7 +122,7 @@ from_arch(){
     [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
     local package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$package" "${unstable}")
+    local repo=$(find_repo "$package")
 
     src=$package/repos/$repo
 
@@ -212,10 +141,9 @@ from_arch(){
         sync_pkg "$src" "$dest" "$git_tree_arch"
         patch_pkg "$pkg"
     else
-        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
+        git_tree_artix=$git_tree_arch
-        [[ $git_tree_arch == 'community' ]] && git_tree_artix=$git_tree_arch
 
-        local pkg_path=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg
+        dest=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg/trunk
 
         cd ${TREE_DIR_ARTIX}/$git_tree_artix
 
@@ -227,12 +155,11 @@ from_arch(){
 
         subrepo_clone "$pkg" "$org"
 
-        cd $pkg_path
+        commit_jenkins_files "$pkg"
-        commit_jenkins_files
 
-        dest=$pkg_path/trunk
+        prepare_dir "$dest"
 
-        sync_pkg "$src" "$dest" "$git_tree_arch"
+        sync_pkg "$src" "$dest" "$git_tree_artix"
     fi
 }
 
@@ -242,7 +169,7 @@ view_build(){
     [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
 
     local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
-    local repo=$(find_repo "$pkg_path" "${unstable}")
+    local repo=$(find_repo "$pkg_path")
 
     src=$pkg_path/repos/$repo
 
@@ -262,36 +189,28 @@ load_vars /etc/makepkg.conf
 
 sync=false
 sync_arch=true
-compare=false
-unstable=false
-staging=true
-upgrades=false
-downgrades=false
-artix=false
 import=false
 view=false
 createnew=false
+conf=false
 
 PACKAGE=''
 
 tree_names=(packages community)
 TEAM=${tree_names[0]}
+SUBORG=''
 
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo '    -p <pkg>      Package name'
-    echo '    -t <team>     Team name (only with -m)'
+    echo '    -t <team>     Team name (only with -n)'
     echo "                  [default: ${TEAM}]"
+    echo '    -o <org>      Org of subrepo (only with -c)'
     echo "    -s            Clone or pull repos"
     echo "    -z            Don't clone or pull arch repos"
-    echo '    -c            Compare packages'
-    echo '    -u            Show upgrade packages'
-    echo '    -d            Show downgrade packages'
-    echo '    -a            Show testing packages'
-    echo "    -y            Don't inlcude staging packages"
-    echo '    -x            Include unstable kde and gnome'
     echo '    -i            Import a package from arch repos'
     echo '    -m            Make new remote subrepo and clone it'
+    echo '    -c            Configure subrepo url'
     echo '    -v            View package depends'
     echo '    -h            This help'
     echo ''
@@ -301,23 +220,19 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:t:csudayimzxvh'
+opts='p:t:o:csinzvh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) PACKAGE="$OPTARG" ;;
         t) TEAM="$OPTARG" ;;
+        o) SUBORG="$OPTARG" ;;
         s) sync=true ;;
         z) sync_arch=false ;;
-        c) compare=true ;;
-        u) upgrades=true ;;
-        d) downgrades=true ;;
-        a) artix=true ;;
-        y) staging=false ;;
         i) import=true ;;
-        m) createnew=true ;;
+        n) createnew=true ;;
         v) view=true ;;
-        x) unstable=true ;;
+        c) conf=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -332,8 +247,8 @@ ${sync} && sync_repos
 
 ${view} && view_build "${PACKAGE}"
 
-${compare} && show_version_table
-
 ${import} && from_arch "${PACKAGE}"
 
 ${createnew} && mkrepo "${PACKAGE}" "${TEAM}"
+
+${conf} && subrepo_config "${PACKAGE}" "${SUBORG}"

bin/commitpkg.in

@@ -61,14 +61,12 @@ commit_pkg(){
         cd ${TREE_DIR_ARTIX}/${git_tree}
 
         if ${push};then
-            msg2 "Check (%s)" "${git_tree}"
+            mainrepo_pull "${git_tree}"
-            git pull origin master
 
-            msg2 "Update (%s)" "${PACKAGE}"
             subrepo_push "${PACKAGE}"
+            subrepo_clean "${PACKAGE}"
 #             sleep 1
-            msg2 "Update (%s)" "${git_tree}"
+            mainrepo_push "${git_tree}"
-            git push origin master
         fi
         git prune
     else
@@ -114,14 +112,12 @@ symlink_commit_pkg(){
         cd ${TREE_DIR_ARTIX}/${git_tree}
 
         if ${push};then
-            msg2 "Check (%s)" "${git_tree}"
+            mainrepo_pull "${git_tree}"
-            git pull origin master
 
-            msg2 "Update (%s)" "${PACKAGE}"
             subrepo_push "${PACKAGE}"
+            subrepo_clean "${PACKAGE}"
 #             sleep 1
-            msg2 "Update (%s)" "${git_tree}"
+            mainrepo_push "${git_tree}"
-            git push origin master
         fi
         git prune
     else

bin/comparepkg.in

@@ -0,0 +1,139 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+VERSION=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+
+show_version_table(){
+    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+
+    for tree in ${tree_names[@]};do
+
+        local git=$(find ${TREE_DIR_ARTIX}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+
+        for package in ${git[@]}; do
+
+            local pkg=${package##*/}
+            local artixrepo=$(find_repo "$package" "${staging}" "${unstable}")
+            local artixshow=${artixrepo%-*}
+            local pkgbuild=$package/repos/$artixrepo/PKGBUILD
+
+            if [[ -f $pkgbuild ]];then
+
+                source $pkgbuild 2>/dev/null
+                local artixver=$(get_full_version $pkg)
+
+                local archpath=$(get_import_path $pkg)
+
+                local archrepo=$(find_repo "$archpath" "${staging}" "${unstable}")
+
+                local archshow=${archrepo%-*}
+                pkgbuild=$archpath/repos/$archrepo/PKGBUILD
+
+                if [[ -f $pkgbuild ]];then
+                    source $pkgbuild 2>/dev/null
+                    local archver=$(get_full_version $pkg)
+                fi
+
+                local result=$(vercmp "$artixver" "$archver")
+
+                local repomatch=false
+                [[ "$archrepo" == "$artixrepo" ]] && repomatch=true
+
+                if ${move};then
+
+                    if [ $result -gt -1 ];then
+                        case $artixrepo in
+                            *testing*|*staging*)
+                                if $repomatch;then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                        esac
+                    fi
+
+                elif ${upgrades};then
+
+                    if [ $result -eq -1 ];then
+                        msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                    fi
+
+                elif ${downgrades};then
+
+                    if [ $result -eq 1 ];then
+                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                            msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
+                        fi
+                    fi
+
+                fi
+                unset pkgver epoch pkgrel artixver archver pkgbuild archpath
+
+            fi
+        done
+    done
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+unstable=false
+staging=true
+upgrades=false
+downgrades=false
+move=false
+
+tree_names=(packages community)
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo '    -u            Show upgrade packages'
+    echo '    -d            Show downgrade packages'
+    echo '    -m            Show packages to move'
+    echo "    -x            Don't inlcude staging packages"
+    echo '    -y            Include unstable kde and gnome'
+    echo '    -h            This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='udmxyh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        m) move=true ;;
+        x) staging=false ;;
+        y) unstable=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+show_version_table

lib/util-pkg-subrepo.sh

@@ -11,7 +11,22 @@
 
 subrepo_push(){
     local pkg="$1"
-    git subrepo push "$pkg" --clean
+    msg2 "Update (%s)" "$pkg"
+    git subrepo push "$pkg"
+}
+
+subrepo_config(){
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    local url=gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git
+    msg2 "Update .gitrepo (%s) [%s]" "$pkg" "$url"
+    git subrepo config "$pkg" remote "$url"
+}
+
+subrepo_clean(){
+    local pkg="$1"
+    msg2 "Clean (%s)" "$pkg"
+    git subrepo clean "$pkg"
 }
 
 subrepo_pull(){
@@ -26,28 +41,50 @@ subrepo_clone(){
     git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
 }
 
+mainrepo_pull(){
+    local tree="$1"
+    msg2 "Check (%s)" "${tree}"
+    git push origin master
+}
+
+
+mainrepo_push(){
+    local tree="$1"
+    msg2 "Update (%s)" "${tree}"
+    git push origin master
+}
+
 write_jenkinsfile(){
-    local jenkins=Jenkinsfile
+    local pkg="$1"
-    echo '@Library(["PackagePipeline", "RepoPackage"]) import org.artixlinux.RepoPackage' > $jenkins
+    local jenkins=$pkg/Jenkinsfile
+
+    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > $jenkins
     echo '' >> $jenkins
     echo 'PackagePipeline(new RepoPackage(this))' >> $jenkins
     echo '' >> $jenkins
+
+    git add $jenkins
 }
 
 write_agentyaml(){
-    local agent=.artixlinux/agent.yaml label='master'
+    local pkg="$1"
-    [[ -d .artixlinux ]] || mkdir .artixlinux
+    local agent=$pkg/.artixlinux/agent.yaml label='master'
+    [[ -d $pkg/.artixlinux ]] || mkdir $pkg/.artixlinux
+
     echo '%YAML 1.2' > $agent
     echo '---' >> $agent
     echo '' >> $agent
     echo "label: $label" >> $agent
     echo '' >> $agent
+
+    git add $agent
 }
 
 commit_jenkins_files(){
-    write_jenkinsfile
+    local pkg="$1"
-    write_agentyaml
+
-    git add Jenkinsfile
+    write_jenkinsfile "$pkg"
-    git add .artixlinux
+    write_agentyaml "$pkg"
+
     git commit -m "add jenkinsfile & .artixlinux/agent.yaml"
 }

lib/util-pkg.sh

@@ -82,10 +82,10 @@ find_tree(){
 }
 
 find_repo(){
-    local pkg="$1" unst="$2" stag="$3" repo=
+    local pkg="$1" stag="$2" unst="$3" repo=
-    local repos=(core extra testing community community-testing mulitilib multilib-testing)
+    local repos=(core extra testing community community-testing multilib multilib-testing)
 
-    $stag && repos+=(staging community-staging mulitilib-staging)
+    $stag && repos+=(staging community-staging multilib-staging)
     $unst && repos+=(gnome-unstable kde-unstable)
 
     for r in ${repos[@]};do