deployiso: remove old Sf code

commitpkg: only --clean on subrepo push

bin/deployiso.in

@@ -18,8 +18,7 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 
 connect(){
-    local home="/home/frs/project/${project}"
-    echo "${ACCOUNT},${project}@frs.${file_host}:${home}"
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
 }
 
 prepare_transfer(){
@@ -58,14 +57,11 @@ 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
 
-rsync_args=(-aP --progress -e ssh)
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")
 
 usage() {
     echo "Usage: ${0##*/} [options]"

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.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,7 +98,13 @@ init_artools_iso(){
 
     [[ -z ${UPLIMIT} ]] && UPLIMIT=1000
 
-    [[ -z ${ACCOUNT} ]] && ACCOUNT="[SetUser]"
+    FILE_HOST="download.${DOMAIN}"
+
+    [[ -z ${FILE_HOME} ]] && FILE_HOME="/srv/iso"
+
+    [[ -z ${FILE_PORT} ]] && FILE_PORT=65432
+
+    [[ -z ${ACCOUNT} ]] && ACCOUNT="naughtyISOuploader"
 }