deployiso: remove old Sf code

commitpkg: only --clean on subrepo push

bin/buildtree.in

@@ -84,7 +84,7 @@ show_version_table(){
                 fi
                 if ${artix};then
                     if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         case $ar in
                             *goblins)
                                 if [[ "$archrepo" == "$artixrepo" ]];then
@@ -104,11 +104,11 @@ show_version_table(){
                     fi
                 else
                     if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                     fi
                     if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         if [[ -n $archver ]] && [[ -n $archrepo ]];then
                             ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                         fi

bin/deployiso.in

@@ -18,8 +18,7 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 
 connect(){
-    local home="/home/frs/project/${PROJECT}"
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
-    echo "${ACCOUNT},${PROJECT}@frs.${FILE_HOST}:${home}"
 }
 
 prepare_transfer(){
@@ -48,8 +47,6 @@ display_settings(){
 
     msg "REMOTE:"
     msg2 "ACCOUNT: %s" "${ACCOUNT}"
-    msg2 "FILE_HOST: %s" "${FILE_HOST}"
-    msg2 "PROFILE: %s" "${PROJECT}"
 
     msg "UPLOAD:"
     msg2 "SRC_DIR: ${SRC_DIR}"
@@ -64,7 +61,7 @@ pretend=false
 update=false
 verbose=false
 
-rsync_args=(-aP --progress -e ssh)
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")
 
 usage() {
     echo "Usage: ${0##*/} [options]"

data/artools.conf

@@ -41,10 +41,5 @@
 # set upload bandwidth limit in kB/s
 # UPLIMIT=1000
 
-# FILE_HOST="sourceforge.net"
-
 # the server user
 # ACCOUNT=[SetUser]
-
-# the server project
-# PROJECT="artix-linux"

lib/util-pkg-subrepo.sh

@@ -16,12 +16,12 @@ subrepo_init(){
 
 subrepo_push(){
     local pkg="$1" branch=master
-    git subrepo push "$pkg" -u -b "$branch"
+    git subrepo push "$pkg" -u -b "$branch" --clean
 }
 
 subrepo_pull(){
     local pkg="$1" name="${2:-$1}" branch=master org=packages
-    git subrepo pull "$pkg" -r gitea@"${GIT_DOMAIN}":"$org"/"$name".git -u -b "$branch"
+    git subrepo pull "$pkg" -r gitea@"${GIT_DOMAIN}":"$org"/"$name".git -u -b "$branch" #--clean
 }
 
 subrepo_clone(){

lib/util-pkg.sh

@@ -139,16 +139,13 @@ find_repo(){
     $unst && repos+=(gnome-unstable kde-unstable)
 
     for r in ${repos[@]};do
-        if [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]];then
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
-            repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
-        elif [[ -f $pkg/repos/$r-any/PKGBUILD ]];then
-            repo=$r-any
-        fi
     done
     echo $repo
 }
 
-arch_to_artix_repo(){
+find_artix_name(){
     local repo="$1"
     case $repo in
         core-*) repo=system ;;

lib/util.sh

@@ -60,7 +60,9 @@ init_artools_base(){
 
 init_artools_pkg(){
 
-    GIT_DOMAIN='gitea.artixlinux.org'
+    DOMAIN='artixlinux.org'
+
+    GIT_DOMAIN="gitea.${DOMAIN}"
 
     GIT_URL="https://${GIT_DOMAIN}"
 
@@ -68,7 +70,7 @@ init_artools_pkg(){
 
     [[ -z ${TREE_DIR_ARTIX} ]] && TREE_DIR_ARTIX="${WORKSPACE_DIR}/artix"
 
-    [[ -z ${HOST_TREE_ARTIX} ]] && HOST_TREE_ARTIX="gitea@gitea.artixlinux.org:artix"
+    [[ -z ${HOST_TREE_ARTIX} ]] && HOST_TREE_ARTIX="gitea@${GIT_DOMAIN}:artix"
 
     [[ -z ${TREE_DIR_ARCH} ]] && TREE_DIR_ARCH="${WORKSPACE_DIR}/archlinux"
 
@@ -96,11 +98,13 @@ init_artools_iso(){
 
     [[ -z ${UPLIMIT} ]] && UPLIMIT=1000
 
-    [[ -z ${FILE_HOST} ]] && FILE_HOST="sourceforge.net"
+    FILE_HOST="download.${DOMAIN}"
 
-    [[ -z ${PROJECT} ]] && PROJECT="artix-linux"
+    [[ -z ${FILE_HOME} ]] && FILE_HOME="/srv/iso"
 
-    [[ -z ${ACCOUNT} ]] && ACCOUNT="[SetUser]"
+    [[ -z ${FILE_PORT} ]] && FILE_PORT=65432
+
+    [[ -z ${ACCOUNT} ]] && ACCOUNT="naughtyISOuploader"
 }