util-pkg: rm repo_map

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,8 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 
 connect(){
-    local home="/home/frs/project/${PROJECT}"
-    echo "${ACCOUNT},${PROJECT}@frs.${FILE_HOST}:${home}"
+    local home="/home/frs/project/${project}"
+    echo "${ACCOUNT},${project}@frs.${file_host}:${home}"
 }
 
 prepare_transfer(){
@@ -48,8 +48,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}"
@@ -60,6 +58,9 @@ load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
+project='artix-linux'
+file_host='sourceforge.net'
+
 pretend=false
 update=false
 verbose=false

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.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
-            repo=$r-x86_64
-        elif [[ -f $pkg/repos/$r-any/PKGBUILD ]];then
-            repo=$r-any
-        fi
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
     done
     echo $repo
 }
 
-arch_to_artix_repo(){
+find_artix_name(){
     local repo="$1"
     case $repo in
         core-*) repo=system ;;

lib/util.sh

@@ -96,10 +96,6 @@ init_artools_iso(){
 
     [[ -z ${UPLIMIT} ]] && UPLIMIT=1000
 
-    [[ -z ${FILE_HOST} ]] && FILE_HOST="sourceforge.net"
-
-    [[ -z ${PROJECT} ]] && PROJECT="artix-linux"
-
     [[ -z ${ACCOUNT} ]] && ACCOUNT="[SetUser]"
 }