buildtree: fix import new pkg

migration of buildtree & commitpkg (#3 )
deployiso: remove old Sf code
2018-12-11 11:45:35 +01:00 · 2018-12-10 21:57:27 +01:00 · 2018-11-18 17:54:10 +01:00 · 2018-11-18 03:14:27 +01:00 · 2018-11-18 03:00:28 +01:00 · 2018-11-15 12:16:00 +01:00
32 changed files with 803 additions and 923 deletions
--- a/104
+++ b/104
@@ -1,38 +1,13 @@
-VERSION=0.9
+VERSION=0.10

 CHROOT_VERSION=0.8

 TOOLS = artools
-ifdef PREFIX
-PREFIX = /usr/local
-endif
+PREFIX ?= /usr/local
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
-
-DIRMODE = -dm0755
-FILEMODE = -m0644
-MODE =  -m0755
-
-LN = ln -sf
-RM = rm -f
-RMD = rm -fr --one-file-system
-M4 = m4 -P
-CHMODAW = chmod a-w
-CHMODX = chmod +x
-
-ifdef WITH-PKG
-WITH-PKG = no
-else
-WITH-PKG = yes
-endif
-ifdef WITH-ISO
-WITH-ISO = no
-else
-WITH-ISO = yes
-endif
-
 CPIODIR = $(SYSCONFDIR)/initcpio

 SYSCONF = \
@@ -65,8 +40,7 @@ BIN_PKG = \
 	bin/buildpkg \
 	bin/buildtree \
 	bin/deploypkg \
-	bin/commitpkg \
-	bin/mkpkgclean
+	bin/commitpkg

 LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
@@ -103,19 +77,17 @@ LIBS_ISO = \
 SHARED_ISO = \
 	data/mkinitcpio.conf

-ifeq ($(WITH-PKG),yes)
+DIRMODE = -dm0755
+FILEMODE = -m0644
+MODE =  -m0755

-all: $(BIN_PKG)
+LN = ln -sf
+RM = rm -f
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x

-endif
-
-ifeq ($(WITH-ISO),yes)
-
-all: $(BIN_ISO)
-
-endif
-
-all: $(BIN_BASE)
+all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)

 EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
 	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
@@ -177,54 +149,6 @@ install_iso: install_cpio
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)

-uninstall_base:
-	for f in $(notdir $(SYSCONF)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(BIN_BASE)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for f in $(notdir $(LIBS_BASE)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(SHARED_BASE)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-	$(RMD) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
-	$(RMD) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	$(RMD) $(DESTDIR)$(DATADIR)/$(TOOLS)
+install: install_base install_pkg install_iso

-uninstall_pkg:
-	for f in $(notdir $(BIN_PKG)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	$(RM) $(DESTDIR)$(BINDIR)/find-libprovides
-	for l in $(COMMITPKG_SYMS); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
-	for f in $(notdir $(LIBS_PKG)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(PATCHES)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches/$$f; done
-	for f in $(notdir $(SHARED_PKG)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-
-uninstall_cpio:
-	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio uninstall
-
-uninstall_iso: uninstall_cpio
-	for f in $(notdir $(BIN_ISO)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for l in $(notdir $(BIN_ISO_SYMS)); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
-	for f in $(notdir $(LIBS_ISO)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(SHARED_ISO)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-
-ifeq ($(WITH-PKG),yes)
-
-install: install_pkg
-
-uninstall: uninstall_pkg
-
-endif
-
-ifeq ($(WITH-ISO),yes)
-
-install: install_iso
-
-uninstall: uninstall_iso
-
-endif
-
-install: install_base
-
-uninstall: uninstall_base
-
-dist:
-	git archive --format=tar --prefix=$(TOOLS)-$(VERSION)/ $(VERSION) | gzip -9 > $(TOOLS)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent $(TOOLS)-$(VERSION).tar.gz
-
-.PHONY: all clean install uninstall dist
+.PHONY: all clean install
--- a/README.md
+++ b/README.md
@@ -6,9 +6,6 @@ artools

 * PREFIX=/usr/local (default if defined)
 * SYSCONFDIR=/etc
-* WITH-PKG=yes
-* WITH-ISO=yes
-

 #### Dependencies

@@ -21,7 +18,6 @@ artools
 ##### Runtime:

 - base:
-
  * openssh
  * rsync
  * haveged
@@ -30,16 +26,14 @@ artools
  * pacman

 - pkg:
-
  * namcap
-  * git
+  * git-subrepo

 - iso:
  * dosfstools
  * libisoburn
  * squashfs-tools
  * mkinitcpio
-  * mktorrent
  * grub

 #### Configuration
--- a/bin/artools-chroot.in
+++ b/bin/artools-chroot.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 shopt -s extglob

@@ -20,6 +20,36 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-mount.sh

+select_os(){
+    local os_list=( $(detect) ) count=${#os_list[@]}
+    if [[ ${count} > 1 ]];then
+        msg "Detected systems:"
+        local i=0
+        for os in ${os_list[@]};do
+            local last=${os##*:}
+            case $last in
+                'efi') count=$((count-1)) ;;
+                *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
+            esac
+        done
+        i=0
+        msg "Select system to mount [0-%s] : " "$((count-1))"
+        read select
+    else
+        select=0
+    fi
+    local os_str=${os_list[$select]} type
+    type=$os_str
+    root=${os_str%%:*}
+    type=${type##*:}
+    if [[ "${type##*:}" == 'linux' ]];then
+        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
+        mount_os "$1" "$root"
+    else
+        die "You can't mount %s!" "$select"
+    fi
+}
+
 display_settings(){
    show_version
    show_config
--- a/bin/basestrap.in
+++ b/bin/basestrap.in
@@ -8,7 +8,7 @@
 #  4) A valid mirror appears in /etc/pacman.d/mirrorlist
 #

-version=@version@
+VERSION=@version@

 shopt -s extglob

--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'
 DATADIR='@datadir@'
@@ -22,12 +22,12 @@ import ${LIBDIR}/util-iso.sh
 prepare_build(){
    timer_start=$(get_timer)

-    load_profile "${profile}"
+    load_profile "${PROFILE}"

    local pacman_conf pac_file="pacman-default.conf"

-    case "${stablility}" in
-        'gremlins'|'goblins') pac_file="pacman-${stablility}.conf" ;;
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') pac_file="pacman-${REPOSITORY}.conf" ;;
    esac

    pacman_conf="${DATADIR}/$pac_file"
@@ -35,29 +35,30 @@ prepare_build(){

    iso_file=$(gen_iso_fn).iso

-    mkchroot_args+=(-C ${pacman_conf})
-    work_dir=${chroots_iso}/${profile}/${target_arch}
+    iso_label="ARTIX_$(date +%Y%m)"

-    iso_dir="${iso_pool}/${profile}"
+    mkchroot_args+=(-C ${pacman_conf} -m)
+    work_dir=${CHROOTS_ISO}/${PROFILE}/${ARCH}

-    iso_root=${chroots_iso}/${profile}/iso
-    mnt_dir=${chroots_iso}/${profile}/mnt
+    iso_dir="${ISO_POOL}/${PROFILE}"
+
+    iso_root=${CHROOTS_ISO}/${PROFILE}/iso
+    mnt_dir=${CHROOTS_ISO}/${PROFILE}/mnt
    prepare_dir "${mnt_dir}"
    prepare_dir "${iso_dir}"
+    prepare_dir "${iso_root}"
 }

 show_profile(){
    msg2 "iso_file: %s" "${iso_file}"
    if ${verbose};then
-        msg2 "autologin: %s" "${autologin}"
-
-        msg2 "hostname: %s" "${hostname}"
-        msg2 "username: %s" "${username}"
-        msg2 "password: %s" "${password}"
-        msg2 "addgroups: %s" "${addgroups}"
-
-        msg2 "services_live: %s" "${services_live[*]}"
-        msg2 "services: %s" "${services[*]}"
+        msg2 "AUTOLOGIN: %s" "${AUTOLOGIN}"
+        msg2 "HOST_NAME: %s" "${HOST_NAME}"
+        msg2 "USER_NAME: %s" "${USER_NAME}"
+        msg2 "PASSWORD: %s" "${PASSWORD}"
+        msg2 "ADDGROUPS: %s" "${ADDGROUPS}"
+        msg2 "SERVICES_LIVE: %s" "${SERVICES_LIVE[*]}"
+        msg2 "SERVICES: %s" "${SERVICES[*]}"
    fi
 }

@@ -66,10 +67,10 @@ display_settings(){
    show_config

    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "initsys: %s" "${initsys}"
-    [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
-    msg2 "stablility: %s" "${stablility}"
+    msg2 "PROFILE: %s" "${PROFILE}"
+    msg2 "INITSYS: %s" "${INITSYS}"
+    [[ -n ${GPG_KEY} ]] && msg2 "GPG_KEY: %s" "${GPG_KEY}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"

    msg "ARGS:"
    msg2 "clean_first: %s" "${clean_first}"
@@ -78,14 +79,14 @@ display_settings(){
    msg2 "persist: %s" "${persist}"

    msg "ISO SETTINGS:"
-    msg2 "iso_version: %s" "${iso_version}"
+    msg2 "ISO_VERSION: %s" "${ISO_VERSION}"

    msg "BUILD:"
    show_profile
 }

 build(){
-    msg "Start building [%s]" "${profile}"
+    msg "Start building [%s]" "${PROFILE}"
    if ${clean_first};then
        for copy in "${work_dir}"/*; do
            [[ -d $copy ]] || continue
@@ -103,19 +104,19 @@ build(){
    fi

    if ${iso_only}; then
-        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
+        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${PROFILE}"
        compress_images
        exit 1
    fi
    if ${images_only}; then
        prepare_images
-        warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
+        warning "Continue compress: buildiso -p %s -zc ..." "${PROFILE}"
        exit 1
    else
        prepare_images
        compress_images
    fi
-    msg "Finished building [%s]" "${profile}"
+    msg "Finished building [%s]" "${PROFILE}"
    show_elapsed_time "${FUNCNAME}" "${timer_start}"
 }

@@ -132,19 +133,20 @@ persist=false

 mkchroot_args=()
 cmd=${0##*/}
-stablility=${cmd##*-}
+
+REPOSITORY=${cmd##*-}

 usage() {
    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Profile [default: ${profile}]"
+    echo "    -p <profile>       Profile [default: ${PROFILE}]"
    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_iso}]"
+    echo "                       [default: ${CHROOTS_ISO}]"
    echo '    -t <dir>           Target directory'
-    echo "                       [default: ${iso_pool}]"
+    echo "                       [default: ${ISO_POOL}]"
    echo '    -i <name>          Init system to use'
-    echo "                       [default: ${initsys}]"
+    echo "                       [default: ${INITSYS}]"
    echo '    -g <key>           The gpg key for sfs signing'
-    echo "                       [default: ${gpgkey}]"
+    echo "                       [default: ${GPG_KEY}]"
    echo '    -m                 Set SquashFS image mode to persistence'
    echo '    -c                 Disable clean work dir'
    echo '    -x                 Build images only'
@@ -164,11 +166,11 @@ opts='p:r:t:i:g:czxmvqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        r) chroots_iso="$OPTARG" ;;
-        t) iso_pool="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        g) gpgkey="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        r) CHROOTS_ISO="$OPTARG" ;;
+        t) ISO_POOL="$OPTARG" ;;
+        i) INITSYS="$OPTARG" ;;
+        g) GPG_KEY="$OPTARG" ;;
        c) clean_first=false ;;
        x) images_only=true ;;
        z) iso_only=true ;;
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 shopt -s nullglob

@@ -33,14 +33,14 @@ display_settings(){
    show_config

    msg "OPTIONS:"
-    msg2 "chroots_pkg: %s" "${chroots_pkg}"
-    msg2 "repository: %s" "${repository}"
+    msg2 "CHROOTS_PKG: %s" "${CHROOTS_PKG}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"

    msg "ARGS:"
    msg2 "create_first: %s" "${create_first}"
    msg2 "makepkg_args: %s" "${makepkg_args[*]}"
    msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
-    
+
    msg "BUILD:"
    show_pkg
 }
@@ -55,24 +55,24 @@ pretend=false
 mkchroot_args=()
 mkchrootpkg_args=(-c -n)

-repository='default'
-    
+REPOSITORY='default'
+
 prepare_build(){
-    local pac_file= mp_file='makepkg.conf'    
-            
+    local pac_file= mp_file='makepkg.conf'
+
    base_devel=('base-devel')
-    
-    case ${repository} in
-        'system'|'world'|'galaxy') repository='default' ;;
+
+    case ${REPOSITORY} in
+        'system'|'world'|'galaxy') REPOSITORY='default' ;;
        lib32*) base_devel+=('multilib-devel') ;;
-        galaxy-gremlins|galaxy-goblins) repository=${repository#*-} ;;
+        galaxy-gremlins|galaxy-goblins) REPOSITORY=${REPOSITORY#*-} ;;
    esac
-    local pac_file="pacman-${repository}.conf"
+    local pac_file="pacman-${REPOSITORY}.conf"

    local pacman_conf="${DATADIR}/$pac_file"
    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"

-    work_dir="${chroots_pkg}/${repository}-${target_arch}"
+    work_dir="${CHROOTS_PKG}/${REPOSITORY}-${ARCH}"

    local makepkg_conf="${DATADIR}/$mp_file"
    [[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
@@ -83,7 +83,7 @@ prepare_build(){
 }

 build(){
-    local timer_start=$(get_timer) 
+    local timer_start=$(get_timer)

    exec mkchrootpkg "${mkchrootpkg_args[@]}"
    show_elapsed_time "${FUNCNAME}" "${timer_start}"
@@ -91,7 +91,7 @@ build(){

 usage() {
    echo "Usage: ${0##*/} [options] -- [makepkg_args]"
-    echo "    -r <dir>           Repository [default: ${repository}]"
+    echo "    -r <dir>           Repository [default: ${REPOSITORY}]"
    echo '    -c                 Create root chroot'
    echo '    -q                 Query settings and pretend build'
    echo '    -h                 This help'
@@ -107,7 +107,7 @@ opts='r:cqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        r) repository="$OPTARG" ;;
+        r) REPOSITORY="$OPTARG" ;;
        c) create_first=true ;;
        q) pretend=true ;;
        h|?) usage 0 ;;
@@ -124,7 +124,7 @@ prepare_build
 ${pretend} && display_settings && exit

 if ${create_first} || [[ ! -d ${work_dir}/root ]];then
-    msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
+    msg "Creating chroot for [%s] (%s)..." "${REPOSITORY}" "${ARCH}"

    for copy in "${work_dir}"/*; do
        [[ -d $copy ]] || continue
@@ -139,7 +139,7 @@ if ${create_first} || [[ ! -d ${work_dir}/root ]];then

    rm -rf --one-file-system "${work_dir}"
    mkdir -p "${work_dir}"
-    setarch "${target_arch}" mkchroot \
+    setarch "${ARCH}" mkchroot \
        "${mkchroot_args[@]}"  "${base_devel[@]}" || abort
 else
    lock 9 "${work_dir}/root.lock" "Locking clean chroot"
--- a/bin/buildtree.in
+++ b/bin/buildtree.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
@@ -22,106 +22,145 @@ import ${LIBDIR}/util-pkg-gitea.sh
 import ${LIBDIR}/util-pkg-subrepo.sh

 pull_tree_arch(){
-    cd ${tree_dir_arch}
-    for tree in packages community;do
+    cd ${TREE_DIR_ARCH}
+    for tree in ${tree_names[@]};do
        if [[ -d ${tree} ]];then
            cd ${tree}
-                msg "Checking (%s)" "${tree}"
-                pull_tree
+            msg "Checking (%s)" "${tree}"
+            pull_tree
            cd ..
        else
            msg "Cloning (%s) ..." "$tree"
-            clone_tree "${host_tree_arch}/${tree}"
+            clone_tree "${HOST_TREE_ARCH}/${tree}"
        fi
    done
 }

+config_tree(){
+    local tree="$1"
+    cd $tree
+        git config --bool pull.rebase true
+        git config commit.gpgsign true
+        if [[ -n "${GPGKEY}" ]];then
+            git config user.signingkey "${GPGKEY}"
+        else
+            warning "No GPGKEY configured in makepkg.conf!"
+        fi
+    cd ..
+}
+
 pull_tree_artix(){
-    cd ${tree_dir_artix}
-    for tree in packages packages-galaxy;do
+    cd ${TREE_DIR_ARTIX}
+    for tree in ${tree_names[@]};do
        if [[ -d ${tree} ]];then
+            config_tree "${tree}"
            cd ${tree}
-                git config --bool pull.rebase true
-                git config commit.gpgsign true
-                if [[ -n "${GPGKEY}" ]];then
-                    git config user.signingkey "${GPGKEY}"
-                else
-                    warning "No GPGKEY configured in makepkg.conf!"
-                fi
-                msg "Checking (%s)" "${tree}"
-                pull_tree
+            msg "Checking (%s)" "${tree}"
+            pull_tree
            cd ..
        else
            msg "Cloning (%s) ..." "$tree"
-            clone_tree "${host_tree_artix}/${tree}"
+            clone_tree "${HOST_TREE_ARTIX}/${tree}"
+            config_tree "${tree}"
        fi
    done
 }

 show_version_table(){
    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
-    for tree in packages packages-galaxy;do
-        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
-        for pkg_path in ${git[@]}; do
-            local artixrepo=$(find_repo "$pkg_path" "${unstable}" "${staging}")
-            if [[ -d $pkg_path/repos/$artixrepo ]];then
-                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
-                local pkg=${pkg_path##*/}
+
+    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 src=$(get_import_path "$tree" "$pkg")
-                local archrepo=$(find_repo "$src/$pkg" "${unstable}" "${staging}")
-                if [[ -d $src/$pkg/repos/$archrepo ]];then
-                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
+
+                local archpath=${TREE_DIR_ARCH}/$tree/$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
-                        local ar=$(arch_to_artix_repo "$artixrepo")
-                        case $ar in
-                            *goblins)
+                        case $artixrepo in
+                            *staging*)
                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                                fi
                            ;;
-                            *gremlins)
+                            *testing*)
                                if [[ "$archrepo" == "$artixrepo" ]];then
-                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                                else
-                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                                fi
                            ;;
                        esac
                    fi
+
                else
+
                    if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
-                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                    fi
+
                    if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
-                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "$archshow" "$artixshow" "$pkg" "$archver" "$artixver"
                        fi
                    fi
+
                fi
-                unset pkgver epoch pkgrel artixver archver _package
+                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"
+    rsync "${rsync_args[@]}" $src/ $dest/
+}
+
 show_deps(){
    local src="$1" repo="$2"
+
    source $src/PKGBUILD 2>/dev/null
+
    [[ $arch == 'any' ]] && CARCH=any
+
    local archver=$(get_full_version $pkg)
+
    msg "git tree: %s" "$git_tree_arch"
    msg2 "repo: %s" "$repo"
-    msg2 "Package Name: %s" "$pkg"
+    [[ -n ${pkgbase} ]] && msg2 "pkgbase: %s" "${pkgbase}"
+    msg2 "pkgname: %s" "${pkgname[*]}"
+    [[ -n $pkgdesc ]] && msg2 "pkgdesc: %s" "${pkgdesc}"
    msg2 "Arch Version: %s" "$archver"
    msg2 "arch: %s" "$CARCH"
+
    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
@@ -130,56 +169,59 @@ show_deps(){

 from_arch(){
    local pkg="$1" src= dest=
-    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
    [[ -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 package=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$package" "${unstable}")

-    src=$pkg_path/repos/$repo
-    $trunk && src=$pkg_path/trunk
+    src=$package/repos/$repo

-    local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
-    dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
-
-    cd ${tree_dir_arch}/$git_tree_arch
+    local git_tree_artix=$(find_tree "${TREE_DIR_ARTIX}" "$pkg")
+    dest=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg/trunk

    show_deps "$src" "$repo"

    if [[ -d $dest ]];then
-        cd ${tree_dir_artix}/$git_tree_artix
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix

        source $dest/PKGBUILD 2>/dev/null
        local artixver=$(get_full_version $pkg)

        msg2 "Artix Version: %s" "$artixver"
-        info "Update from archlinux (%s)" "$git_tree_arch"
-        rsync "${rsync_args[@]}" $src/ $dest/
-        patch_pkg "$pkg" "$tree"
+        sync_pkg "$src" "$dest" "$git_tree_arch"
+        patch_pkg "$pkg"
    else
        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
-        [[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
+        [[ $git_tree_arch == 'community' ]] && git_tree_artix=$git_tree_arch

-        cd ${tree_dir_artix}/$git_tree_artix
+        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

-        create_repo "$pkg"
-        add_repo_to_team "$pkg" "$pkg_path"
-        subrepo_clone "$pkg"
+        local org=$(get_pkg_org "$pkg")

-        info "Import from archlinux (%s)" "$git_tree_arch"
-        rsync "${rsync_args[@]}" $src/ $dest/
-        patch_pkg "$pkg" "$tree"
+        create_repo "$pkg" "$org"
+
+        add_repo_to_team "$pkg" "$org" "$git_tree_artix"
+
+        subrepo_clone "$pkg" "$org"
+
+        cd $pkg_path
+        commit_jenkins_files
+
+        dest=$pkg_path/trunk
+
+        sync_pkg "$src" "$dest" "$git_tree_arch"
    fi
 }

 view_build(){
    local pkg="$1" src=
-    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    local git_tree_arch=$(find_tree "${TREE_DIR_ARCH}" "$pkg")
    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"

-    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
+    local pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
    local repo=$(find_repo "$pkg_path" "${unstable}")

    src=$pkg_path/repos/$repo
@@ -197,7 +239,7 @@ display_settings(){
    show_config

    msg "OPTIONS:"
-    msg2 "package: %s" "${package}"
+    msg2 "PACKAGE: %s" "${PACKAGE}"

    msg "ARGS:"
    msg2 "sync: %s" "${sync}"
@@ -210,11 +252,10 @@ display_settings(){
    msg2 "unstable: %s" "${unstable}"
    msg2 "import: %s" "${import}"
    msg2 "view: %s" "${view}"
-    msg2 "trunk: %s" "${trunk}"

    msg "PATHS:"
-    msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
-    msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
+    msg2 "TREE_DIR_ARTIX: %s" "${TREE_DIR_ARTIX}"
+    msg2 "TREE_DIR_ARCH: %s" "${TREE_DIR_ARCH}"
 }

 load_user_info
@@ -234,10 +275,9 @@ downgrades=false
 artix=false
 import=false
 view=false
-trunk=false
-package=''

-rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
+PACKAGE=''
+tree_names=(packages community)

 usage() {
    echo "Usage: ${0##*/} [options]"
@@ -251,7 +291,7 @@ usage() {
    echo "    -y            Don't inlcude staging packages"
    echo '    -x            Include unstable kde and gnome'
    echo '    -i            Import a package from arch repos'
-    echo '    -t            Import from arch trunk'
+    echo "    -w            Don't write Jenkinsfile and agent.yaml on import"
    echo '    -v            View package depends'
    echo '    -q            Query settings'
    echo '    -h            This help'
@@ -262,11 +302,11 @@ usage() {

 orig_argv=("$0" "$@")

-opts='p:csudayiztxvqh'
+opts='p:csudayizxvqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        p) package="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
        s) sync=true ;;
        z) sync_arch=false ;;
        c) compare=true ;;
@@ -275,7 +315,6 @@ while getopts "${opts}" arg; do
        a) artix=true ;;
        y) staging=false ;;
        i) import=true ;;
-        t) trunk=true ;;
        v) view=true ;;
        x) unstable=true ;;
        q) pretend=true ;;
@@ -286,15 +325,15 @@ done

 shift $(($OPTIND - 1))

-prepare_dir "${tree_dir_artix}"
-prepare_dir "${tree_dir_arch}"
+prepare_dir "${TREE_DIR_ARTIX}"
+prepare_dir "${TREE_DIR_ARCH}"

 ${pretend} && display_settings && exit 1

 ${sync} && sync_repos

-${view} && view_build "${package}"
+${view} && view_build "${PACKAGE}"

 ${compare} && show_version_table

-${import} && from_arch "${package}"
+${import} && from_arch "${PACKAGE}"
--- a/bin/checkpkg.in
+++ b/bin/checkpkg.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

--- a/bin/chroot-run.in
+++ b/bin/chroot-run.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 chroot_version=@chroot_version@

@@ -22,7 +22,6 @@ import ${LIBDIR}/util-mount.sh

 working_dir=''
 files=()
-keep_mirrors=false
 nosetarch=false

 usage() {
--- a/bin/commitpkg.in
+++ b/bin/commitpkg.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
@@ -20,63 +20,74 @@ import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 import ${LIBDIR}/util-pkg-subrepo.sh

+is_valid_repo(){
+    local src="$1"
+    case $src in
+        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
 commit_pkg(){
-    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
    if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}/${package}
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}

        source trunk/PKGBUILD
        [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${package}")
+        local ver=$(get_full_version "${PACKAGE}")
        local commit_msg=""

        if ${remove};then
            local action='remove'
-            if [[ "${source_repo}" == 'trunk' ]];then
-                local pkg=${package}
+            if [[ "${REPO_SRC}" == 'trunk' ]];then
+                local pkg=${PACKAGE}
                git rm -r trunk
            else
-                local pkg="${package}-$ver"
-                git rm -r repos/"${source_repo}-$CARCH"
+                local pkg="${PACKAGE}-$ver"
+                git rm -r repos/"${REPO_SRC}-$CARCH"
            fi
-            commit_msg="[${source_repo}] '$pkg' ${action}"
+            commit_msg="[${REPO_SRC}] '$pkg' ${action}"
            msg "Action: %s" "$commit_msg"
        else
            local action='modify'
-            commit_msg="[${source_repo}] '${package}-$ver' ${action}"
+            commit_msg="[${REPO_SRC}] '${PACKAGE}-$ver' ${action}"
            msg "Action: %s" "$commit_msg"
            git add .

        fi
        git commit -m "$commit_msg"

-        cd ${tree_dir_artix}/${git_tree}
+        cd ${TREE_DIR_ARTIX}/${git_tree}

        if ${push};then
-            msg "Checking (%s)" "${git_tree}"
+            msg2 "Check (%s)" "${git_tree}"
            git pull origin master
-            subrepo_push "${package}"
-            sleep 1
+
+            msg2 "Update (%s)" "${PACKAGE}"
+            subrepo_push "${PACKAGE}"
+#             sleep 1
+            msg2 "Update (%s)" "${git_tree}"
            git push origin master
        fi
        git prune
    else
-        error "Package '%s' does not exist!" "${package}"
+        error "Package '%s' does not exist!" "${PACKAGE}"
    fi
 }

 symlink_commit_pkg(){
-    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
+    local git_tree=$(find_tree "${TREE_DIR_ARTIX}" "${PACKAGE}")
    if [[ -n ${git_tree} ]];then
-        cd ${tree_dir_artix}/${git_tree}/${package}
+        cd ${TREE_DIR_ARTIX}/${git_tree}/${PACKAGE}

        source trunk/PKGBUILD
        [[ $arch == 'any' ]] && CARCH=any
-        local ver=$(get_full_version "${package}")
+        local ver=$(get_full_version "${PACKAGE}")

-        if [[ ${source_repo} == 'trunk' ]];then
+        if [[ ${REPO_SRC} == 'trunk' ]];then
            local action='add'
-            local dest="${target_repo}-$CARCH"
+            local dest="${REPO_DEST}-$CARCH"

            [[ -d repos/$dest ]] && git rm -r repos/$dest
            [[ ! -d repos ]] && mkdir repos
@@ -85,7 +96,7 @@ symlink_commit_pkg(){
            cp trunk/* repos/$dest/
        else
            local action='move'
-            local src="${source_repo}-$CARCH" dest="${target_repo}-$CARCH"
+            local src="${REPO_SRC}-$CARCH" dest="${REPO_DEST}-$CARCH"

            [[ -d repos/$dest ]] && git rm -r repos/$dest
            [[ ! -d repos ]] && mkdir repos
@@ -94,24 +105,27 @@ symlink_commit_pkg(){
            cp repos/$src/* repos/$dest/
            git rm -r repos/$src
        fi
-        local commit_msg="[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
+        local commit_msg="[${REPO_SRC}] -> [${REPO_DEST}] '${PACKAGE}-$ver' ${action}"
        msg "Action: %s" "$commit_msg"

        git add .
        git commit -m "$commit_msg"

-        cd ${tree_dir_artix}/${git_tree}
+        cd ${TREE_DIR_ARTIX}/${git_tree}

        if ${push};then
-            msg "Checking (%s)" "${git_tree}"
+            msg2 "Check (%s)" "${git_tree}"
            git pull origin master
-            subrepo_push "${package}"
-            sleep 1
+
+            msg2 "Update (%s)" "${PACKAGE}"
+            subrepo_push "${PACKAGE}"
+#             sleep 1
+            msg2 "Update (%s)" "${git_tree}"
            git push origin master
        fi
        git prune
    else
-        error "Package '%s' does not exist!" "${package}"
+        error "Package '%s' does not exist!" "${PACKAGE}"
    fi
 }

@@ -120,9 +134,9 @@ display_settings(){
    show_config

    msg "OPTIONS:"
-    msg2 "source_repo: %s" "${source_repo}"
-    msg2 "target_repo: %s" "${target_repo}"
-    msg2 "package: %s" "${package}"
+    msg2 "REPO_SRC: %s" "${REPO_SRC}"
+    msg2 "REPO_DEST: %s" "${REPO_DEST}"
+    msg2 "PACKAGE: %s" "${PACKAGE}"

    msg "ARGS:"
    msg2 "remove: %s" "${remove}"
@@ -135,18 +149,18 @@ load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artoo
 load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf

-source_repo='trunk'
-package=''
+REPO_SRC='trunk'
+PACKAGE=''
 remove=false
 push=false
 pretend=false

 cmd=${0##*/}
-target_repo=${cmd%pkg}
+REPO_DEST=${cmd%pkg}

 usage() {
    echo "Usage: ${0##*/} [options]"
-    echo "    -s <name>          Source repository [default:${source_repo}]"
+    echo "    -s <name>          Source repository [default:${REPO_SRC}]"
    echo '    -p <pkg>           Package name'
    echo '    -r                 Delete from repo (commitpkg only)'
    echo '    -u                 Push'
@@ -163,8 +177,8 @@ opts='p:s:urqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        s) source_repo="$OPTARG" ;;
-        p) package="$OPTARG" ;;
+        s) REPO_SRC="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
        r) remove=true ;;
        u) push=true ;;
        q) pretend=true ;;
@@ -177,12 +191,12 @@ shift $(($OPTIND - 1))

 ${pretend} && display_settings && exit 1

-if $(is_valid_repo "${source_repo}");then
+if $(is_valid_repo "${REPO_SRC}");then
    if [[ "${cmd}" == 'commitpkg' ]];then
        commit_pkg
    else
        symlink_commit_pkg
    fi
 else
-    error "source repository '%s' is not valid!" "${source_repo}"
+    error "source repository '%s' is not valid!" "${REPO_SRC}"
 fi
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -9,43 +9,48 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'

 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-iso-publish.sh
+
+connect(){
+    echo "${ACCOUNT}@${FILE_HOST}:${FILE_HOME}"
+}
+
+prepare_transfer(){
+    DEST_DIR="/iso/${PROFILE}/"
+    SRC_DIR="${ISO_POOL}/${PROFILE}/"
+}
+
+sync_dir(){
+    msg "Start upload [%s] ..." "${PROFILE}"
+    rsync "${rsync_args[@]}" ${SRC_DIR} $(connect)${DEST_DIR}
+    msg "Done upload [%s]" "${PROFILE}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}

 display_settings(){
    show_version
    show_config

    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "uplimit: %s kB/s" "${uplimit}"
+    msg2 "PROFILE: %s" "${PROFILE}"
+    msg2 "UPLIMIT: %s kB/s" "${UPLIMIT}"

    msg "ARGS:"
    msg2 "update: %s" "${update}"
    msg2 "verbose: %s" "${verbose}"
-    msg2 "torrent: %s" "${torrent}"
-
-    if ${torrent};then
-        msg2 "tracker_url: %s" "${tracker_url}"
-        msg2 "piece_size: %s" "${piece_size}"
-        msg2 "host_mirrors: %s" "${host_mirrors[*]}"
-        msg2 "torrent_meta: %s" "${torrent_meta}"
-    fi

    msg "REMOTE:"
-    msg2 "account: %s" "${account}"
-    msg2 "file_host: %s" "${file_host}"
-    msg2 "project: %s" "${project}"
+    msg2 "ACCOUNT: %s" "${ACCOUNT}"

    msg "UPLOAD:"
-    msg2 "src_dir: ${src_dir}"
-    msg2 "target_dir: ${target_dir}"
+    msg2 "SRC_DIR: ${SRC_DIR}"
+    msg2 "DEST_DIR: ${DEST_DIR}"
 }

 load_user_info
@@ -55,16 +60,14 @@ load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artoo
 pretend=false
 update=false
 verbose=false
-torrent=false

-rsync_args=(-aP --progress -e ssh)
+rsync_args=(-aP --progress -e "ssh -p ${FILE_PORT}")

 usage() {
    echo "Usage: ${0##*/} [options]"
-    echo "    -p                 Source folder to upload [default: ${profile}]"
-    echo "    -l                 Limit bandwidth in kB/s [default:${uplimit}]"
+    echo "    -p                 Source folder to upload [default: ${PROFILE}]"
+    echo "    -l                 Limit bandwidth in kB/s [default:${UPLIMIT}]"
    echo '    -u                 Update remote directory'
-    echo '    -t                 Create iso torrent'
    echo '    -q                 Query settings and pretend upload'
    echo '    -v                 Verbose output'
    echo '    -h                 This help'
@@ -73,14 +76,13 @@ usage() {
    exit $1
 }

-opts='p:l:uvtqh'
+opts='p:l:uvqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        l) uplimit="$OPTARG" ;;
+        p) PROFILE="$OPTARG" ;;
+        l) UPLIMIT="$OPTARG" ;;
        u) update=true; rsync_args+=(-u) ;;
-        t) torrent=true ;;
        v) verbose=true; rsync_args+=(-v --stats) ;;
        q) pretend=true; rsync_args+=(-n) ;;
        h|?) usage 0 ;;
@@ -92,7 +94,7 @@ shift $(($OPTIND - 1))

 timer_start=$(get_timer)

-rsync_args+=(--bwlimit=${uplimit})
+rsync_args+=(--bwlimit=${UPLIMIT})

 prepare_transfer

--- a/bin/deploypkg.in
+++ b/bin/deploypkg.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
@@ -20,7 +20,7 @@ import ${LIBDIR}/util-pkg.sh

 update_repo(){
    local repo="$1" pkgfile ver ext=db.tar.xz
-    local repo_path=${repos_root}/$repo/os/${target_arch} packages=()
+    local repo_path=${REPOS_ROOT}/$repo/os/${ARCH} packages=()
    source PKGBUILD
    for name in ${pkgname[@]};do
        [[ $arch == any ]] && CARCH=any
@@ -31,7 +31,7 @@ update_repo(){
            if ${add_pkg};then
                local action='add'
                packages+=("$pkg")
-#                 checkpkg $pkg
+                checkpkg "${pkgfile}"
                if ${sign_pkg};then
                    [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
                    signfile ${pkgfile}
@@ -55,7 +55,7 @@ display_settings(){
    show_config

    msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
+    msg2 "REPOSITORY: %s" "${REPOSITORY}"

    msg "ARGS:"
    msg2 "add_pkg: %s" "${add_pkg}"
@@ -72,12 +72,12 @@ load_vars /etc/makepkg.conf
 pretend=false
 add_pkg=false
 del_pkg=false
-repository=
+REPOSITORY=
 sign_pkg=false

 usage() {
    echo "Usage: ${0##*/} [options]"
-    echo "    -d                 Destination repository [default:${repository}]"
+    echo "    -d                 Destination repository [default:${REPOSITORY}]"
    echo '    -a                 Add package(s) to repository'
    echo '    -r                 Remove package(s) from repository'
    echo '    -s                 Sign package(s)'
@@ -94,7 +94,7 @@ opts='d:arsqh'

 while getopts "${opts}" arg; do
    case "${arg}" in
-        d) repository="$OPTARG" ;;
+        d) REPOSITORY="$OPTARG" ;;
        a) add_pkg=true; del_pkg=false ;;
        r) del_pkg=true; add_pkg=false ;;
        s) sign_pkg=true ;;
@@ -106,8 +106,8 @@ done

 shift $(($OPTIND - 1))

-prepare_dir "${repos_root}"
+prepare_dir "${REPOS_ROOT}"

 ${pretend} && display_settings && exit 1

-update_repo "${repository}"
+update_repo "${REPOSITORY}"
--- a/bin/find-libdeps.in
+++ b/bin/find-libdeps.in
@@ -9,13 +9,30 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util-pkg.sh

+# $1: sofile
+# $2: soarch
+process_sofile() {
+    # extract the library name: libfoo.so
+    local soname="${1%.so?(+(.+([0-9])))}".so
+    # extract the major version: 1
+    soversion="${1##*\.so\.}"
+    if [[ "$soversion" = "$1" ]] && (($IGNORE_INTERNAL)); then
+        continue
+    fi
+    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
+    # libfoo.so=1-64
+        msg "${soname}=${soversion}-$2"
+        soobjects+=("${soname}=${soversion}-$2")
+    fi
+}
+
 set -e
 shopt -s extglob

--- a/bin/finddeps.in
+++ b/bin/finddeps.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

--- a/bin/fstabgen.in
+++ b/bin/fstabgen.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 shopt -s extglob

--- a/bin/lddd.in
+++ b/bin/lddd.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

--- a/bin/mkchroot.in
+++ b/bin/mkchroot.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 chroot_version=@chroot_version@

@@ -23,15 +23,17 @@ working_dir=''
 files=()

 nosetarch=false
+copy_mirrorlist=true
+basestrap_args=(-Gc)

 usage() {
    echo "Usage: ${0##*/} [options] working-dir package-list..."
    echo ' options:'
    echo '    -C <file>     Location of a pacman config file'
    echo '    -M <file>     Location of a makepkg config file'
-    echo '    -U <url>      Set a specific mirror'
    echo '    -c <dir>      Set pacman cache'
    echo '    -f <file>     Copy file from the host to the chroot'
+    echo '    -m            Do not copy mirrorlist to the chroot'
    echo '    -s            Do not run setarch'
    echo '    -h            This message'
    exit 1
@@ -39,16 +41,16 @@ usage() {

 orig_argv=("$0" "$@")

-opts='hC:M:U:c:f:s'
+opts='hC:M:c:f:sm'

 while getopts ${opts} arg; do
    case "${arg}" in
        C) pacman_conf="$OPTARG" ;;
        M) makepkg_conf="$OPTARG" ;;
-        U) mirror="$OPTARG" ;;
        c) cache_dir="$OPTARG" ;;
        f) files+=("$OPTARG") ;;
        s) nosetarch=true ;;
+        m) copy_mirrorlist=false; basestrap_args+=(-M) ;;
        h|?) usage ;;
        *) error "invalid argument '%s'" "$arg"; usage ;;
    esac
@@ -98,7 +100,7 @@ while read -r varname; do
    _env+=("$varname=${!varname}")
 done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
-basestrap -Gc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
+basestrap "${basestrap_args[@]}" ${pacman_conf:+-C "$pacman_conf"} "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'

 echo "$chroot_version" > "$working_dir/.artools"

--- a/bin/mkchrootpkg.in
+++ b/bin/mkchrootpkg.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

@@ -210,10 +210,6 @@ _chrootbuild() {

    #export LANG=en_US.UTF-8

-    # workaround meson locale errors
-    # supposedly fixed with coming python-3.7
-    #locale-gen &> /dev/null
-
    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"

    ret=$?
--- a/bin/mkpkgclean.in
+++ b/bin/mkpkgclean.in
@@ -1,93 +0,0 @@
-#!/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@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-
-prepare_clean(){
-    if [[ -n ${repository} ]];then
-        storage_dir=${repos_root}/${repository}/os/${target_arch}
-        paccache_args+=(-c "${storage_dir}" -k 1)
-    else
-        if [[ -n ${PKGDEST} ]];then
-            storage_dir=${PKGDEST}
-            paccache_args+=(-c "${storage_dir}" -k 4)
-        else
-            die "PKGDEST not set in makepkg.conf!"
-        fi
-    fi
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "repository: %s" "${repository}"
-
-    msg "PATH:"
-    msg2 "storage_dir: %s" "${storage_dir}"
-
-    msg "ARGS:"
-    msg2 "paccache_args: %s" "${paccache_args[*]}"
-
-    paccache "${paccache_args[@]}"
-}
-
-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
-
-clean=false
-pretend=false
-repository=''
-storage_dir=''
-paccache_args=(-v)
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -d <dir>           Directory [default:${repository}]"
-    echo '    -c                 Clean up'
-    echo '    -q                 Query settings and pretend cleaning'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='d:cqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        d) repository="$OPTARG" ;;
-        c) clean=true ; paccache_args+=(-r) ;;
-        q) pretend=true; paccache_args+=(-d) ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-prepare_clean
-
-${pretend} && display_settings && exit 1
-
-${clean} && paccache "${paccache_args[@]}"
--- a/bin/signfile.in
+++ b/bin/signfile.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-version=@version@
+VERSION=@version@

 LIBDIR='@libdir@'

--- a/data/artools.conf
+++ b/data/artools.conf
@@ -3,60 +3,43 @@
 #############################################

 # build dir where buildpkg or buildiso chroots are created
-# chroots_dir=/var/lib/artools
+# CHROOTS_DIR=/var/lib/artools

 # the workspace directory
-# workspace_dir="/home/${OWNER}/artools-workspace"
+# WORKSPACE_DIR="/home/${OWNER}/artools-workspace"

 #############################################
 ################ artools-pkg ################
 #############################################

-# git user access token
-# git_token=''
+# gitea user access token
+# GIT_TOKEN=''

-# host_tree_artix='gitea@gitea.artixlinux.org:artix'
+# HOST_TREE_ARTIX='gitea@gitea.artixlinux.org:artix'

-# host_tree_arch=git://projects.archlinux.org/svntogit
+# HOST_TREE_ARCH=git://projects.archlinux.org/svntogit

 # default repos root
-# repos_root=${workspace_dir}/repos
+# REPOS_ROOT=${WORKSPACE_DIR}/repos

 #############################################
 ################ artools-iso ################
 #############################################

 # the iso storage directory
-# iso_pool="${workspace_dir}/iso"
+# ISO_POOL="${WORKSPACE_DIR}/iso"

 # the dist release; default: auto
-# iso_version=$(date +%Y%m%d)
+# ISO_VERSION=$(date +%Y%m%d)

-# possible values: openrc, (s6, runit) not yet supported
-# initsys="openrc"
-
-# unset defaults to given value
-# kernel="linux"
+# possible values: openrc, runit (s6 not yet supported)
+# INITSYS="openrc"

 # gpg key; leave empty or commented to skip sfs signing
-# gpgkey=""
+# GPG_KEY=""

 # set upload bandwidth limit in kB/s
-# uplimit=100
-
-# the torrent tracker urls, comma separated
-# tracker_url='udp://mirror.strits.dk:6969'
-
-# file_host="sourceforge.net"
+# UPLIMIT=1000

 # the server user
-# account=[SetUser]
-
-# the server project
-# project="artix-linux"
-
-# host mirrors
-# host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-# Piece size, 2^n
-# piece_size=21
+# ACCOUNT=[SetUser]
--- a/initcpio/Makefile
+++ b/initcpio/Makefile
@@ -1,6 +1,5 @@
 DIRMODE = -dm0755
 MODE =  -m0755
-RM = rm -f

 CPIOHOOKS = \
 	$(wildcard hooks/*)
@@ -19,13 +18,6 @@ install_initcpio:
 	install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
 	install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)

-uninstall_initcpio:
-	for f in $(notdir $(CPIOHOOKS)); do $(RM) $(DESTDIR)$(CPIODIR)/hooks/$$f; done
-	for f in $(notdir $(CPIOINST)); do $(RM) $(DESTDIR)$(CPIODIR)/install/$$f; done
-	for f in $(notdir $(SCRIPT)); do $(RM) $(DESTDIR)$(CPIODIR)/$$f; done
-
 install: install_initcpio

-uninstall: uninstall_initcpio
-
-.PHONY: install uninstall
+.PHONY: install
--- a/lib/util-iso-grub.sh
+++ b/lib/util-iso-grub.sh
@@ -20,28 +20,37 @@ prepare_initcpio(){
 prepare_initramfs(){
    local mnt="$1"
    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-artix.conf
-    if [[ -n ${gpgkey} ]]; then
-        user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
-        exec 17<>${AT_USERCONFDIR}/gpgkey
+
+    if [[ "${PROFILE}" != 'base' ]];then
+        sed -e 's/artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs //' -i $mnt/etc/mkinitcpio-artix.conf
+    fi
+
+    if [[ -n ${GPG_KEY} ]]; then
+        user_run "gpg --export ${GPG_KEY} >${AT_USERCONFDIR}/gpgkey"
+        exec 17<>${AT_USERCONFDIR}/GPG_KEY
    fi
    local _kernel=$(cat $mnt/usr/lib/modules/*/version)
-    ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
+    ARTIX_GNUPG_FD=${GPG_KEY:+17} chroot-run $mnt \
        /usr/bin/mkinitcpio -k ${_kernel} \
        -c /etc/mkinitcpio-artix.conf \
        -g /boot/initramfs.img

-    if [[ -n ${gpgkey} ]]; then
+    if [[ -n ${GPG_KEY} ]]; then
        exec 17<&-
    fi
-    if [[ -f ${AT_USERCONFDIR}/gpgkey ]]; then
-        rm ${AT_USERCONFDIR}/gpgkey
+    if [[ -f ${AT_USERCONFDIR}/GPG_KEY ]]; then
+        rm ${AT_USERCONFDIR}/GPG_KEY
    fi
 }

 prepare_boot_extras(){
    local src="$1" dest="$2"
-#     cp $src/boot/intel-ucode.img $dest/intel_ucode.img
-#     cp $src/usr/share/licenses/intel-ucode/LICENSE $dest/intel_ucode.LICENSE
+
+    for u in intel amd;do
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    done
+
    cp $src/boot/memtest86+/memtest.bin $dest/memtest
    cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
@@ -83,8 +92,13 @@ prepare_grub(){
    cp -r ${theme}/themes/artix ${grub}/themes/
    cp -r ${theme}/{locales,tz} ${grub}

-    msg2 "Creating %s ..." "unicode.pf2"
-    grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+    if [[ -f /usr/share/grub/unicode.pf2 ]];then
+        msg2 "Copying %s ..." "unicode.pf2"
+        cp /usr/share/grub/unicode.pf2 ${grub}/unicode.pf2
+    else
+        msg2 "Creating %s ..." "unicode.pf2"
+        grub-mkfont -o ${grub}/unicode.pf2 /usr/share/fonts/misc/unifont.bdf
+    fi

    local size=4M mnt="${mnt_dir}/efiboot" efi_img="$3/efi.img"
    msg2 "Creating fat image of %s ..." "${size}"
--- a/lib/util-iso-profile.sh
+++ b/lib/util-iso-profile.sh
@@ -11,25 +11,25 @@
 init_profile(){
    local profdir="$1" prof="$2"

-    root_list="$profdir/base/Packages-Root"
-    root_overlay="$profdir/base/root-overlay"
-    live_list="$profdir/base/Packages-Live"
-    live_overlay="$profdir/base/live-overlay"
+    ROOT_LIST="$profdir/base/Packages-Root"
+    ROOT_OVERLAY="$profdir/base/root-overlay"
+    LIVE_LIST="$profdir/base/Packages-Live"
+    LIVE_OVERLAY="$profdir/base/live-overlay"

-    [[ -f "$profdir/$prof/Packages-Root" ]] && root_list="$profdir/$prof/Packages-Root"
-    [[ -d "$profdir/$prof/root-overlay" ]] && root_overlay="$profdir/$prof/root-overlay"
+    [[ -f "$profdir/$prof/Packages-Root" ]] && ROOT_LIST="$profdir/$prof/Packages-Root"
+    [[ -d "$profdir/$prof/root-overlay" ]] && ROOT_OVERLAY="$profdir/$prof/root-overlay"

-    [[ -f "$profdir/$prof/Packages-Desktop" ]] && desktop_list="$profdir/$prof/Packages-Desktop"
-    [[ -d "$profdir/$prof/desktop-overlay" ]] && desktop_overlay="$profdir/$prof/desktop-overlay"
+    [[ -f "$profdir/$prof/Packages-Desktop" ]] && DESKTOP_LIST="$profdir/$prof/Packages-Desktop"
+    [[ -d "$profdir/$prof/desktop-overlay" ]] && DESKTOP_OVERLAY="$profdir/$prof/desktop-overlay"

-    [[ -f "$profdir/$prof/Packages-Live" ]] && live_list="$profdir/$prof/Packages-Live"
-    [[ -d "$profdir/$prof/live-overlay" ]] && live_overlay="$profdir/$prof/live-overlay"
+    [[ -f "$profdir/$prof/Packages-Live" ]] && LIVE_LIST="$profdir/$prof/Packages-Live"
+    [[ -d "$profdir/$prof/live-overlay" ]] && LIVE_OVERLAY="$profdir/$prof/live-overlay"
 }

 load_profile(){
    local prof="$1"
    local profdir="${DATADIR}/iso-profiles"
-    [[ -d ${workspace_dir}/iso-profiles ]] && profdir=${workspace_dir}/iso-profiles
+    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profdir=${WORKSPACE_DIR}/iso-profiles

    init_profile "$profdir" "$prof"

@@ -37,34 +37,34 @@ load_profile(){

    [[ -r $profdir/$prof/profile.conf ]] && source $profdir/$prof/profile.conf

-    [[ -z ${displaymanager} ]] && displaymanager="none"
+    [[ -z ${DISPLAYMANAGER} ]] && DISPLAYMANAGER="none"

-    [[ -z ${autologin} ]] && autologin="true"
-    [[ ${displaymanager} == 'none' ]] && autologin="false"
+    [[ -z ${AUTOLOGIN} ]] && AUTOLOGIN="true"
+    [[ ${DISPLAYMANAGER} == 'none' ]] && AUTOLOGIN="false"

-    [[ -z ${hostname} ]] && hostname="artix"
+    [[ -z ${HOST_NAME} ]] && HOST_NAME="artix"

-    [[ -z ${username} ]] && username="artix"
+    [[ -z ${USER_NAME} ]] && USER_NAME="artix"

-    [[ -z ${password} ]] && password="artix"
+    [[ -z ${PASSWORD} ]] && PASSWORD="artix"

-    if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+    if [[ -z ${ADDGROUPS} ]];then
+        ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
    fi

-    if [[ -z ${services[@]} ]];then
-        services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+    if [[ -z ${SERVICES[@]} ]];then
+        SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
    fi

-    if [[ ${displaymanager} != "none" ]];then
-        case "${initsys}" in
-            'openrc') services+=('xdm') ;;
-            'runit') services+=("${displaymanager}") ;;
+    if [[ ${DISPLAYMANAGER} != "none" ]];then
+        case "${INITSYS}" in
+            'openrc') SERVICES+=('xdm') ;;
+            'runit') SERVICES+=("${DISPLAYMANAGER}") ;;
        esac
    fi

-    if [[ -z ${services_live[@]} ]];then
-        services_live=('artix-live' 'pacman-init')
+    if [[ -z ${SERVICES_LIVE[@]} ]];then
+        SERVICES_LIVE=('artix-live' 'pacman-init')
    fi

    return 0
@@ -78,37 +78,35 @@ write_live_session_conf(){
    echo '# live session configuration' > ${conf}
    echo '' >> ${conf}
    echo '# autologin' >> ${conf}
-    echo "autologin=${autologin}" >> ${conf}
+    echo "AUTOLOGIN=${AUTOLOGIN}" >> ${conf}
    echo '' >> ${conf}
-    echo '# live username' >> ${conf}
-    echo "username=${username}" >> ${conf}
+    echo '# live user name' >> ${conf}
+    echo "USERNAME=${USERNAME}" >> ${conf}
    echo '' >> ${conf}
    echo '# live password' >> ${conf}
-    echo "password=${password}" >> ${conf}
+    echo "PASSWORD=${PASSWORD}" >> ${conf}
    echo '' >> ${conf}
    echo '# live group membership' >> ${conf}
-    echo "addgroups='${addgroups}'" >> ${conf}
+    echo "ADDGROUPS='${ADDGROUPS}'" >> ${conf}
 }

 load_pkgs(){
    local pkglist="$1" init="$2"
    info "Loading Packages: [%s] ..." "${pkglist##*/}"

-    local _init="s|>$init||g"
+    local _init="s|@$init||g"
    case "$init" in
-        'openrc') _init_rm1="s|>runit.*||g"; _init_rm2="s|>s6*||g" ;;
-        's6') _init_rm1="s|>runit.*||g"; _init_rm2="s|>openrc.*||g" ;;
-        'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
+        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6*||g" ;;
+        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
+        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
    esac

-    local _blacklist="s|>blacklist.*||g" \
-        _space="s| ||g" \
+    local _space="s| ||g" \
        _clean=':a;N;$!ba;s/\n/ /g' \
        _com_rm="s|#.*||g"

    packages=($(sed "$_com_rm" "$pkglist" \
            | sed "$_space" \
-            | sed "$_blacklist" \
            | sed "$_purge" \
            | sed "$_init" \
            | sed "$_init_rm1" \
--- a/lib/util-iso-publish.sh
+++ b/lib/util-iso-publish.sh
@@ -1,51 +0,0 @@
-#!/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.
-
-connect(){
-    local home="/home/frs/project/${project}"
-    echo "${account},${project}@frs.${file_host}:${home}"
-}
-
-gen_webseed(){
-    local webseed seed="$1"
-    for mirror in ${host_mirrors[@]};do
-        webseed=${webseed:-}${webseed:+,}"https://${mirror}.dl.${seed}"
-    done
-    echo ${webseed}
-}
-
-make_torrent(){
-    find ${src_dir} -type f -name "*.torrent" -delete
-
-    if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
-        for iso in $(ls ${src_dir}/*.iso);do
-            local seed=${file_host}/project/${project}${target_dir}${iso##*/}
-            local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
-            ${verbose} && mktorrent_args+=(-v)
-            info "mktorrent_args: %s" "${mktorrent_args[@]}"
-            msg2 "Creating (%s) ..." "${iso##*/}.torrent"
-            mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
-        done
-    fi
-}
-
-prepare_transfer(){
-    target_dir="/iso/${profile}/"
-    src_dir="${iso_pool}/${profile}/"
-    ${torrent} && make_torrent
-}
-
-sync_dir(){
-    msg "Start upload [%s] ..." "${profile}"
-    rsync "${rsync_args[@]}" ${src_dir} $(connect)${target_dir}
-    msg "Done upload [%s]" "${profile}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}
--- a/lib/util-iso-yaml.sh
+++ b/lib/util-iso-yaml.sh
@@ -15,7 +15,7 @@ write_users_conf(){
    echo "---" > "$conf"
    echo "defaultGroups:" >> "$conf"
    local IFS=','
-    for g in ${addgroups[@]};do
+    for g in ${ADDGROUPS[@]};do
        echo "    - $g" >> "$conf"
    done
    unset IFS
@@ -23,29 +23,46 @@ write_users_conf(){
    echo "doAutologin:     false" >> "$conf"
    echo "sudoersGroup:    wheel" >> "$conf"
    echo "setRootPassword: true" >> "$conf"
-#     echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
-    echo "avatarFilePath:  ~/.face" >> "$conf"
+
+#     echo "passwordRequirements:" >> "$conf"
+#     echo "    minLength: -1" >> "$conf"
+#     echo "    maxLength: -1" >> "$conf"
+#     echo "    libpwquality:" >> "$conf"
+#     echo "        - minlen=8" >> "$conf"
+#     echo "        - minclass=80" >> "$conf"
 }

 write_servicescfg_conf(){
    local init="$2"
-    local conf="$1"/"$init"cfg.conf state='add'
+    local conf="$1"/services-"$init".conf
    msg2 "Writing %s ..." "${conf##*/}"
    echo '---' >  "$conf"
-    if [[ "$init" == 'runit' ]];then
-        state='enabled'
-        echo 'svdir: /etc/runit/sv' >> "$conf"
-        echo '' >> "$conf"
-        echo 'runsvdir: /etc/runit/runsvdir' >> "$conf"
-    fi
-    echo '' >> "$conf"
-    echo 'services:' >> "$conf"
-    echo "    $state:" >> "$conf"
-    for svc in ${services[@]};do
-        echo "      - name: $svc" >> "$conf"
-        echo '        runlevel: default' >> "$conf"
-    done
+    case "$init" in
+        'runit')
+            echo 'svDir: /etc/runit/sv' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runsvDir: /etc/runit/runsvdir' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            echo "    enabled:" >> "$conf"
+            for svc in ${SERVICES[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+        'openrc')
+            echo 'initdDir: /etc/init.d' >> "$conf"
+            echo '' >> "$conf"
+            echo 'runlevelsDir: /etc/runlevels' >> "$conf"
+            echo '' >> "$conf"
+            echo 'services:' >> "$conf"
+            for svc in ${SERVICES[@]};do
+                echo "      - name: $svc" >> "$conf"
+                echo '        runlevel: default' >> "$conf"
+            done
+        ;;
+    esac
 }

 write_postcfg_conf(){
@@ -53,21 +70,15 @@ write_postcfg_conf(){
    sed -e "s|openrc|$init|" -i "$conf"
 }

-write_netinstall_conf(){
-    local conf="$1/netinstall.conf" init="$2"
-    sed -e "s|netgroups-openrc.yaml|netgroups-$init.yaml|" -i "$conf"
-}
-
 configure_calamares(){
    local mods="$1/etc/calamares/modules" init="$2"
    if [[ -d "$mods" ]];then
        info "Configuring [Calamares]"
-        write_netinstall_conf "$mods" "$init"
        write_users_conf "$mods"
        write_servicescfg_conf "$mods" "$init"
        write_postcfg_conf "$mods" "$init"
-        local name="$init"cfg
-        sed -e "s|openrccfg|$name|" -i "$1"/etc/calamares/settings.conf
+        local name=services-"$init"
+        sed -e "s|services-openrc|$name|" -i "$1"/etc/calamares/settings.conf
        info "Done configuring [Calamares]"
    fi
 }
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -87,6 +87,7 @@ error_function() {
 # $1: function
 run_log(){
    local func="$1" log_dir='/var/log/artools'
+    [[ ! -d $log_dir ]] && mkdir -p $log_dir
    local logfile=${log_dir}/$(gen_iso_fn).$func.log
    logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
    mkfifo "$logpipe"
@@ -149,13 +150,13 @@ add_svc_runit(){

 set_xdm(){
    if [[ -f $1/etc/conf.d/xdm ]];then
-        local conf='DISPLAYMANAGER="'${displaymanager}'"'
+        local conf='DISPLAYMANAGER="'${DISPLAYMANAGER}'"'
        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
    fi
 }

 configure_hosts(){
-    sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
+    sed -e "s|localhost.localdomain|localhost.localdomain ${HOST_NAME}|" -i $1/etc/hosts
 }

 configure_logind(){
@@ -170,37 +171,37 @@ configure_logind(){

 configure_services(){
    local mnt="$1"
-    info "Configuring [%s]" "${initsys}"
-    case ${initsys} in
+    info "Configuring [%s]" "${INITSYS}"
+    case ${INITSYS} in
        'openrc')
-            for svc in ${services[@]}; do
+            for svc in ${SERVICES[@]}; do
                [[ $svc == "xdm" ]] && set_xdm "$mnt"
                add_svc_rc "$mnt" "$svc" "default"
            done
-            for svc in ${services_live[@]}; do
+            for svc in ${SERVICES_LIVE[@]}; do
                add_svc_rc "$mnt" "$svc" "default"
            done
        ;;
        'runit')
-            for svc in ${services[@]}; do
+            for svc in ${SERVICES[@]}; do
                add_svc_runit "$mnt" "$svc"
            done
-            for svc in ${services_live[@]}; do
+            for svc in ${SERVICES_LIVE[@]}; do
                add_svc_runit "$mnt" "$svc"
            done
        ;;
    esac
-    info "Done configuring [%s]" "${initsys}"
+    info "Done configuring [%s]" "${INITSYS}"
 }

 configure_system(){
    local mnt="$1"
-    case ${initsys} in
+    case ${INITSYS} in
        'openrc' | 'runit')
            configure_logind "$mnt" "elogind"
        ;;
    esac
-    echo ${hostname} > $mnt/etc/hostname
+    echo ${HOST_NAME} > $mnt/etc/hostname
 }

 clean_iso_root(){
@@ -261,7 +262,7 @@ configure_live_image(){
    configure_hosts "$fs"
    configure_system "$fs"
    configure_services "$fs"
-    configure_calamares "$fs" "${initsys}"
+    configure_calamares "$fs" "${INITSYS}"
    write_live_session_conf "$fs"
    msg "Done configuring [livefs]"
 }
@@ -271,7 +272,7 @@ make_sig () {
    msg2 "Creating signature file..."
    cd "$idir"
    user_own "$idir"
-    user_run "gpg --detach-sign --default-key ${gpgkey} $file.sfs"
+    user_run "gpg --detach-sign --default-key ${GPG_KEY} $file.sfs"
    chown -R root "$idir"
    cd ${OLDPWD}
 }
@@ -291,7 +292,7 @@ make_sfs() {
        error "The path %s does not exist" "${src}"
        retrun 1
    fi
-    local timer=$(get_timer) dest=${iso_root}/artix/${target_arch}
+    local timer=$(get_timer) dest=${iso_root}/artix/${ARCH}
    local name=${1##*/}
    local sfs="${dest}/${name}.sfs"
    mkdir -p ${dest}
@@ -347,7 +348,7 @@ make_sfs() {
    make_checksum "${dest}" "${name}"
    ${persist} && rm "${src}.img"

-    if [[ -n ${gpgkey} ]];then
+    if [[ -n ${GPG_KEY} ]];then
        make_sig "${dest}" "${name}"
    fi

@@ -405,10 +406,13 @@ make_iso() {

 gen_iso_fn(){
    local vars=("artix") name
-    vars+=("${profile}")
-    [[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
-    vars+=("${iso_version}")
-    vars+=("${target_arch}")
+    vars+=("${PROFILE}")
+    vars+=("${INITSYS}")
+    case "${REPOSITORY}" in
+        'gremlins'|'goblins') vars+=("${REPOSITORY}") ;;
+    esac
+    vars+=("${ISO_VERSION}")
+    vars+=("${ARCH}")
    for n in ${vars[@]};do
        name=${name:-}${name:+-}${n}
    done
@@ -417,7 +421,7 @@ gen_iso_fn(){

 install_packages(){
    local fs="$1"
-    setarch "${target_arch}" mkchroot \
+    setarch "${ARCH}" mkchroot \
        "${mkchroot_args[@]}" "${fs}" "${packages[@]}"
 }

@@ -438,7 +442,7 @@ make_rootfs() {

        install_packages "${rootfs}"

-        copy_overlay "${root_overlay}" "${rootfs}"
+        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"

        clean_up_image "${rootfs}"

@@ -457,7 +461,7 @@ make_desktopfs() {

        install_packages "${desktopfs}"

-        copy_overlay "${desktop_overlay}" "${desktopfs}"
+        copy_overlay "${DESKTOP_OVERLAY}" "${desktopfs}"

        umount_overlay
        clean_up_image "${desktopfs}"
@@ -473,16 +477,14 @@ make_livefs() {

        prepare_dir "${livefs}"

-        mount_overlay "${livefs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${livefs}" "${work_dir}" "${DESKTOP_LIST}"

        install_packages "${livefs}"

-        copy_overlay "${live_overlay}" "${livefs}"
+        copy_overlay "${LIVE_OVERLAY}" "${livefs}"

        configure_live_image "${livefs}"

-        pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
-
        umount_overlay

        clean_up_image "${livefs}"
@@ -498,16 +500,16 @@ make_bootfs() {

        prepare_dir "${boot}"

-        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${target_arch}
+        cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${ARCH}

        local bootfs="${work_dir}/bootfs"

-        mount_overlay "${bootfs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${bootfs}" "${work_dir}" "${DESKTOP_LIST}"

        prepare_initcpio "${bootfs}"
        prepare_initramfs "${bootfs}"

-        cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_arch}.img
+        cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${ARCH}.img
        prepare_boot_extras "${bootfs}" "${boot}"

        umount_overlay
@@ -540,14 +542,14 @@ compress_images(){

 prepare_images(){
    local timer=$(get_timer)
-    load_pkgs "${root_list}" "${initsys}"
+    load_pkgs "${ROOT_LIST}" "${INITSYS}"
    run_safe "make_rootfs"
-    if [[ -f "${desktop_list}" ]] ; then
-        load_pkgs "${desktop_list}" "${initsys}"
+    if [[ -f "${DESKTOP_LIST}" ]] ; then
+        load_pkgs "${DESKTOP_LIST}" "${INITSYS}"
        run_safe "make_desktopfs"
    fi
-    if [[ -f ${live_list} ]]; then
-        load_pkgs "${live_list}" "${initsys}"
+    if [[ -f ${LIVE_LIST} ]]; then
+        load_pkgs "${LIVE_LIST}" "${INITSYS}"
        run_safe "make_livefs"
    fi
    run_safe "make_bootfs"
--- a/lib/util-mount.sh
+++ b/lib/util-mount.sh
@@ -33,47 +33,11 @@ get_os_name(){
    echo "$str"
 }

-get_chroot_arch(){
-    local elf=$(file $1/usr/bin/file)
-    elf=${elf//*executable,}
-    echo ${elf%%,*}
-}
-
 chroot_part_mount() {
    info "mount: [%s]" "$2"
    mount "$@" && CHROOT_ACTIVE_PART_MOUNTS=("$2" "${CHROOT_ACTIVE_PART_MOUNTS[@]}")
 }

-select_os(){
-    local os_list=( $(detect) ) count=${#os_list[@]}
-    if [[ ${count} > 1 ]];then
-        msg "Detected systems:"
-        local i=0
-        for os in ${os_list[@]};do
-            local last=${os##*:}
-            case $last in
-                'efi') count=$((count-1)) ;;
-                *) info "$i) $(get_os_name $os)"; i=$((i+1)) ;;
-            esac
-        done
-        i=0
-        msg "Select system to mount [0-%s] : " "$((count-1))"
-        read select
-    else
-        select=0
-    fi
-    local os_str=${os_list[$select]} type
-    type=$os_str
-    root=${os_str%%:*}
-    type=${type##*:}
-    if [[ "${type##*:}" == 'linux' ]];then
-        msg "Mounting (%s) [%s]" "$(get_os_name $os_str)" "$root"
-        mount_os "$1" "$root"
-    else
-        die "You can't mount %s!" "$select"
-    fi
-}
-
 trap_setup(){
    [[ $(trap -p EXIT) ]] && die 'Error! Attempting to overwrite existing EXIT trap'
    trap "$1" EXIT
@@ -151,16 +115,6 @@ mount_os(){
        esac
    done

-    local chroot_arch=$(get_chroot_arch $1)
-    [[ ${chroot_arch} == x86-64 ]] && chroot_arch=${chroot_arch/-/_}
-    case ${target_arch} in
-        i686)
-            if [[ ${chroot_arch} == x86_64 ]];then
-                die "You can't chroot from %s host into %s!" "${target_arch}" "${chroot_arch}"
-            fi
-        ;;
-    esac
-
    chroot_setup "$1"
    chroot_add_resolv_conf "$1"
 }
@@ -171,16 +125,18 @@ chroot_api_mount() {
    chroot_setup "$1"
 }

-chroot_part_umount() {
-    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
-    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
-    unset CHROOT_ACTIVE_PART_MOUNTS CHROOT_ACTIVE_MOUNTS
-}
-
 chroot_api_umount() {
-    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+    if (( ${#CHROOT_ACTIVE_MOUNTS[@]} )); then
+        info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+        umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+    fi
    unset CHROOT_ACTIVE_MOUNTS
 }
+
+chroot_part_umount() {
+    chroot_api_umount
+    info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    unset CHROOT_ACTIVE_PART_MOUNTS
+}
+
--- a/lib/util-pkg-gitea.sh
+++ b/lib/util-pkg-gitea.sh
@@ -9,50 +9,213 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-get_compliant_name(){
-    local gitname="$1"
-    case $gitname in
-        *+) gitname=${gitname//+/plus}
-    esac
-    echo $gitname
-}
-
-
 create_repo(){
-    local pkg="$1"
-    curl -X POST "${git_url}/api/v1/org/packages/repos?access_token=${git_token}" -H "accept: application/json" -H "content-type: application/json" -d "{ \"auto_init\": true, \"name\":\"$pkg\", \"readme\": \"Default\" }"
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    local json="{ \"auto_init\": true, \"name\":\"$gitname\", \"gitignores\":\"ArchLinuxPackages\", \"readme\": \"Default\" }"
+
+    msg2 "Create package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -X POST "${GIT_URL}/api/v1/org/$org/repos?access_token=${GIT_TOKEN}" \
+        -H "accept: application/json" \
+        -H "content-type: application/json" \
+        -d "$json"
+
+    echo
 }

 delete_repo(){
-    local pkg="$1"
+    local pkg="$1" org="$2"
    local gitname=$(get_compliant_name "$pkg")
-    curl -X DELETE "${git_url}/api/v1/repos/packages/$gitname?access_token=${git_token}" -H  "accept: application/json"
+
+    msg2 "Delete package repo [%s] in org (%s)" "${pkg}" "${org}"
+
+    curl -X DELETE "${GIT_URL}/api/v1/repos/$org/$gitname?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
 }

-find_team(){
-    local pkg="$1" team_id=
+load_team_id(){
+    local org="$1" tree="$2" id=0

-    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
-        team_id=18
-    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
-        team_id=18
-    elif [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
-        team_id=19
-    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
-        team_id=19
-    elif [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
-        team_id=20
-    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
-        team_id=20
-    elif [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
-        team_id=21
-    fi
-    echo $team_id
+    case $org in
+        packagesA)
+            case $tree in
+                packages) id=70 ;;
+                community) id=71 ;;
+            esac
+        ;;
+        packagesB)
+            case $tree in
+                packages) id=72 ;;
+                community) id=73 ;;
+            esac
+        ;;
+        packagesC)
+            case $tree in
+                packages) id=74 ;;
+                community) id=75 ;;
+            esac
+        ;;
+        packagesD)
+            case $tree in
+                packages) id=76 ;;
+                community) id=77 ;;
+            esac
+        ;;
+        packagesE)
+            case $tree in
+                packages) id=78 ;;
+                community) id=79 ;;
+            esac
+        ;;
+        packagesF)
+            case $tree in
+                packages) id=80 ;;
+                community) id=81 ;;
+            esac
+        ;;
+        packagesG)
+            case $tree in
+                packages) id=82 ;;
+                community) id=83 ;;
+            esac
+        ;;
+        packagesH)
+            case $tree in
+                packages) id=84 ;;
+                community) id=85 ;;
+            esac
+        ;;
+        packagesI)
+            case $tree in
+                packages) id=86 ;;
+                community) id=87 ;;
+            esac
+        ;;
+        packagesJ)
+            case $tree in
+                packages) id=88 ;;
+                community) id=89 ;;
+            esac
+        ;;
+        packagesK)
+            case $tree in
+                packages) id=90 ;;
+                community) id=91 ;;
+            esac
+        ;;
+        packagesL)
+            case $tree in
+                packages) id=92 ;;
+                community) id=93 ;;
+            esac
+        ;;
+        packagesM)
+            case $tree in
+                packages) id=94 ;;
+                community) id=95 ;;
+            esac
+        ;;
+        packagesN)
+            case $tree in
+                packages) id=96 ;;
+                community) id=97 ;;
+            esac
+        ;;
+        packagesO)
+            case $tree in
+                packages) id=98 ;;
+                community) id=99 ;;
+            esac
+        ;;
+        packagesP)
+            case $tree in
+                packages) id=100 ;;
+                community) id=101 ;;
+            esac
+        ;;
+        packagesQ)
+            case $tree in
+                packages) id=105 ;;
+                community) id=106 ;;
+            esac
+        ;;
+        packagesR)
+            case $tree in
+                packages) id=107 ;;
+                community) id=108 ;;
+            esac
+        ;;
+        packagesS)
+            case $tree in
+                packages) id=109 ;;
+                community) id=110 ;;
+            esac
+        ;;
+        packagesT)
+            case $tree in
+                packages) id=111 ;;
+                community) id=112 ;;
+            esac
+        ;;
+        packagesU)
+            case $tree in
+                packages) id=113 ;;
+                community) id=114 ;;
+            esac
+        ;;
+        packagesV)
+            case $tree in
+                packages) id=115 ;;
+                community) id=116 ;;
+            esac
+        ;;
+        packagesW)
+            case $tree in
+                packages) id=117 ;;
+                community) id=118 ;;
+            esac
+        ;;
+        packagesX)
+            case $tree in
+                packages) id=119 ;;
+                community) id=120 ;;
+            esac
+        ;;
+        packagesY)
+            case $tree in
+                packages) id=121 ;;
+                community) id=122 ;;
+            esac
+        ;;
+        packagesZ)
+            case $tree in
+                packages) id=123 ;;
+                community) id=124 ;;
+            esac
+        ;;
+        packagesPython)
+            case $tree in
+                packages) id=103 ;;
+                community) id=104 ;;
+            esac
+        ;;
+        packagesPerl)
+            case $tree in
+                packages) id=102 ;;
+                community) id=125 ;;
+            esac
+        ;;
+    esac
+    echo $id
 }

 add_repo_to_team(){
-    local pkg="$1" path="$2"
-    local id=$(find_team "$path")
+    local pkg="$1" org="$2" tree="$3"
+    local id=$(load_team_id "$org" "$tree")

-    curl -X PUT "${git_url}/api/v1/teams/$id/repos/packages/$pkg?access_token=${git_token}" -H  "accept: application/json"
+    msg2 "Adding package repo [%s] to team (%s)" "$pkg" "$tree"
+
+    curl -X PUT "${GIT_URL}/api/v1/teams/$id/repos/$org/$pkg?access_token=${GIT_TOKEN}" \
+        -H  "accept: application/json"
 }
--- a/lib/util-pkg-subrepo.sh
+++ b/lib/util-pkg-subrepo.sh
@@ -9,22 +9,45 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-subrepo_init(){
-    local pkg="$1"
-    git subrepo init $pkg -r gitea@${git_domain}:packages/$pkg.git -b master
-}
-
 subrepo_push(){
    local pkg="$1"
-    git subrepo push -u "$pkg" -b master
+    git subrepo push "$pkg" --clean
 }

 subrepo_pull(){
-    local pkg="$1" name="${2:-$1}"
-    git subrepo pull "$pkg" -b master -r gitea@${git_domain}:packages/$name.git -u
+    local pkg="$1"
+    git subrepo pull "$pkg"
 }

 subrepo_clone(){
-    local pkg="$1" name="${2:-$1}"
-    git subrepo clone gitea@gitea.artixlinux.org:packages/$pkg.git "$name" -b master
+    local pkg="$1" org="$2"
+    local gitname=$(get_compliant_name "$pkg")
+    msg2 "Getting package repo [%s] from org (%s)" "$pkg" "$org/$gitname"
+    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$gitname".git "$pkg"
+}
+
+write_jenkinsfile(){
+    local jenkins=Jenkinsfile
+    echo '@Library(["PackagePipeline", "RepoPackage"]) import org.artixlinux.RepoPackage' > $jenkins
+    echo '' >> $jenkins
+    echo 'PackagePipeline(new RepoPackage(this))' >> $jenkins
+    echo '' >> $jenkins
+}
+
+write_agentyaml(){
+    local agent=.artixlinux/agent.yaml label='master'
+    [[ -d .artixlinux ]] || mkdir .artixlinux
+    echo '%YAML 1.2' > $agent
+    echo '---' >> $agent
+    echo '' >> $agent
+    echo "label: $label" >> $agent
+    echo '' >> $agent
+}
+
+commit_jenkins_files(){
+    write_jenkinsfile
+    write_agentyaml
+    git add Jenkinsfile
+    git add .artixlinux
+    git commit -m "add jenkinsfile & .artixlinux/agent.yaml"
 }
--- a/lib/util-pkg.sh
+++ b/lib/util-pkg.sh
@@ -17,18 +17,8 @@ get_remote_head(){
    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
 }

-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
-is_untracked(){
-    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
-    return 0
-}
-
 patch_pkg(){
-    local pkg="$1" repo="$2"
+    local pkg="$1"
    case $pkg in
        'glibc')
            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
@@ -45,8 +35,7 @@ patch_pkg(){
        ;;
        'linux')
            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
-            sed -e 's|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION="-ARTIX"|' \
-                -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+            sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
                -e 's|CONFIG_CRYPTO_SPECK=.*|CONFIG_CRYPTO_SPECK=n|' \
                -i $pkg/trunk/config
            cd $pkg/trunk
@@ -77,12 +66,12 @@ patch_pkg(){
    esac
 }

-write_jenkinsfile(){
-    local pkg="$1" jenkins=Jenkinsfile
-    echo '@Library(["PackagePipeline", "BuildPkg", "DeployPkg", "Notify", "PostBuild", "RepoPackage"]) import org.artixlinux.RepoPackage' > $pkg/$jenkins
-    echo '' >> $pkg/$jenkins
-    echo 'PackagePipeline(new RepoPackage(this))' >> $pkg/$jenkins
-    echo '' >> $pkg/$jenkins
+get_compliant_name(){
+    local gitname="$1"
+    case $gitname in
+        *+) gitname=${gitname//+/plus}
+    esac
+    echo $gitname
 }

 find_tree(){
@@ -92,6 +81,20 @@ find_tree(){
    echo ${result##*/}
 }

+find_repo(){
+    local pkg="$1" unst="$2" stag="$3" repo=
+    local repos=(core extra testing community community-testing mulitilib multilib-testing)
+
+    $stag && repos+=(staging community-staging mulitilib-staging)
+    $unst && repos+=(gnome-unstable kde-unstable)
+
+    for r in ${repos[@]};do
+        [[ -f $pkg/repos/$r-x86_64/PKGBUILD ]] && repo=$r-x86_64
+        [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=$r-any
+    done
+    echo $repo
+}
+
 clone_tree(){
    local timer=$(get_timer) host_tree="$1"
    git clone $host_tree.git
@@ -110,150 +113,16 @@ pull_tree(){
    fi
 }

-push_tree(){
-    local branch="master"
-    git push origin "$branch"
-}
-
-get_import_path(){
-    local tree="$1" import_path=
-    case $tree in
-        packages) import_path=${tree_dir_arch}/packages ;;
-        packages-galaxy) import_path=${tree_dir_arch}/community ;;
+get_pkg_org(){
+    local pkg="$1" org= sub=
+    case ${pkg} in
+        perl-*) org=${pkg:0:6}; sub="${org:5}"; echo "packagesPerl" ;;
+        python-*) org=${pkg:0:8}; sub="${org:7}"; echo "packagesPython" ;;
+        python2-*) org=${pkg:0:9}; sub="${org:8}"; echo "packagesPython" ;;
+        lib32*) org=${pkg:0:7}; sub="${org:6}"; echo "packagesL" ;; #"packages${sub^^}" ;;
+#         lib*) org=${pkg:0:4}; sub="${org:3}"; echo "packagesLib${sub^^}" ;;
+        *) org=${pkg:0:1}; echo "packages${org^^}" ;;
    esac
-    echo $import_path
-}
-
-is_valid_repo(){
-    local src="$1"
-    case $src in
-        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
-find_repo(){
-    local pkg="$1" unst="$2" stag="$3" repo=
-
-    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
-        repo=core-x86_64
-    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
-        repo=core-any
-    fi
-
-    if [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
-        repo=extra-x86_64
-    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
-        repo=extra-any
-    fi
-
-    if [[ -f $pkg/repos/testing-x86_64/PKGBUILD ]];then
-        repo=testing-x86_64
-    elif [[ -f $pkg/repos/testing-any/PKGBUILD ]];then
-        repo=testing-any
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
-            repo=staging-x86_64
-        elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
-            repo=staging-any
-        fi
-    fi
-
-    if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
-        repo=community-x86_64
-    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
-        repo=community-any
-    fi
-
-    if [[ -f $pkg/repos/community-testing-x86_64/PKGBUILD ]];then
-        repo=community-testing-x86_64
-    elif [[ -f $pkg/repos/community-testing-any/PKGBUILD ]];then
-        repo=community-testing-any
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
-            repo=community-staging-x86_64
-        elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
-            repo=community-staging-any
-        fi
-    fi
-
-    if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
-        repo=multilib-x86_64
-    fi
-
-    if [[ -f $pkg/repos/multilib-testing-x86_64/PKGBUILD ]];then
-        repo=multilib-testing-x86_64
-    fi
-
-    if $stag;then
-        if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
-            repo=multilib-staging-x86_64
-        fi
-    fi
-
-    if $unst;then
-        if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
-            repo=gnome-unstable-x86_64
-        elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then
-            repo=gnome-unstable-any
-        fi
-
-        if [[ -f $pkg/repos/kde-unstable-x86_64/PKGBUILD ]];then
-            repo=kde-unstable-x86_64
-        elif [[ -f $pkg/repos/kde-unstable-any/PKGBUILD ]];then
-            repo=kde-unstable-any
-        fi
-    fi
-    echo $repo
-}
-
-arch_to_artix_repo(){
-    local repo="$1"
-    case $repo in
-        core-*) repo=system ;;
-        extra-*) repo=world ;;
-        community-x86_64|community-any) repo=galaxy ;;
-        multilib-x86_64) repo=lib32 ;;
-        testing-*) repo=gremlins ;;
-        staging-*) repo=goblins ;;
-        multilib-testing-x86_64) repo=lib32-gremlins ;;
-        multilib-staging-x86_64) repo=lib32-goblins ;;
-        community-testing-*) repo=galaxy-gremlins ;;
-        community-staging-*) repo=galaxy-goblins ;;
-        kde-unstable-*|gnome-unstable-*) repo=goblins ;;
-    esac
-    echo $repo
-}
-
-# $1: sofile
-# $2: soarch
-process_sofile() {
-    # extract the library name: libfoo.so
-    local soname="${1%.so?(+(.+([0-9])))}".so
-    # extract the major version: 1
-    soversion="${1##*\.so\.}"
-    if [[ "$soversion" = "$1" ]] && (($IGNORE_INTERNAL)); then
-        continue
-    fi
-    if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
-    # libfoo.so=1-64
-        msg "${soname}=${soversion}-$2"
-        soobjects+=("${soname}=${soversion}-$2")
-    fi
-}
-
-pkgver_equal() {
-    if [[ $1 = *-* && $2 = *-* ]]; then
-        # if both versions have a pkgrel, then they must be an exact match
-        [[ $1 = "$2" ]]
-    else
-        # otherwise, trim any pkgrel and compare the bare version.
-        [[ ${1%%-*} = "${2%%-*}" ]]
-    fi
 }

 find_cached_package() {
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -49,68 +49,62 @@ get_osname(){

 init_artools_base(){

-    target_arch=$(uname -m)
+    ARCH=$(uname -m)

-    [[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
+    [[ -z ${CHROOTS_DIR} ]] && CHROOTS_DIR='/var/lib/artools'

-    [[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
+    [[ -z ${WORKSPACE_DIR} ]] && WORKSPACE_DIR=/home/${OWNER}/artools-workspace

-    prepare_dir "${workspace_dir}"
+    prepare_dir "${WORKSPACE_DIR}"
 }

 init_artools_pkg(){

-    git_domain='gitea.artixlinux.org'
+    DOMAIN='artixlinux.org'

-    git_url="https://${git_domain}"
+    GIT_DOMAIN="gitea.${DOMAIN}"

-    [[ -z ${git_token} ]] && git_token=''
+    GIT_URL="https://${GIT_DOMAIN}"

-    [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
+    [[ -z ${GIT_TOKEN} ]] && GIT_TOKEN=''

-    [[ -z ${host_tree_artix} ]] && host_tree_artix="gitea@gitea.artixlinux.org:artix"
+    [[ -z ${TREE_DIR_ARTIX} ]] && TREE_DIR_ARTIX="${WORKSPACE_DIR}/artixlinux"

-    [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
+    [[ -z ${HOST_TREE_ARTIX} ]] && HOST_TREE_ARTIX="gitea@${GIT_DOMAIN}:artixlinux"

-    [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'
+    [[ -z ${TREE_DIR_ARCH} ]] && TREE_DIR_ARCH="${WORKSPACE_DIR}/archlinux"

-    chroots_pkg="${chroots_dir}/buildpkg"
+    [[ -z ${HOST_TREE_ARCH} ]] && HOST_TREE_ARCH='git://projects.archlinux.org/svntogit'

-    [[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
+    CHROOTS_PKG="${CHROOTS_DIR}/buildpkg"
+
+    [[ -z ${REPOS_ROOT} ]] && REPOS_ROOT="${WORKSPACE_DIR}/repos"
 }

 init_artools_iso(){
-    chroots_iso="${chroots_dir}/buildiso"
+    CHROOTS_ISO="${CHROOTS_DIR}/buildiso"

-    [[ -z ${iso_pool} ]] && iso_pool="${workspace_dir}/iso"
+    [[ -z ${ISO_POOL} ]] && ISO_POOL="${WORKSPACE_DIR}/iso"

-    prepare_dir "${iso_pool}"
+    prepare_dir "${ISO_POOL}"

-    profile='base'
+    PROFILE='base'

-    [[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
+    [[ -z ${ISO_VERSION} ]] && ISO_VERSION=$(date +%Y%m%d)

-    iso_label="ARTIX_$(date +%Y%m)"
+    [[ -z ${INITSYS} ]] && INITSYS="openrc"

-    [[ -z ${initsys} ]] && initsys="openrc"
+    [[ -z ${GPG_KEY} ]] && GPG_KEY=''

-    [[ -z ${gpgkey} ]] && gpgkey=''
+    [[ -z ${UPLIMIT} ]] && UPLIMIT=1000

-    [[ -z ${uplimit} ]] && uplimit=100
+    FILE_HOST="download.${DOMAIN}"

-    [[ -z ${tracker_url} ]] && tracker_url='udp://mirror.strits.dk:6969'
+    [[ -z ${FILE_HOME} ]] && FILE_HOME="/srv/iso"

-    [[ -z ${piece_size} ]] && piece_size=21
+    [[ -z ${FILE_PORT} ]] && FILE_PORT=65432

-    [[ -z ${file_host} ]] && file_host="sourceforge.net"
-
-    [[ -z ${project} ]] && project="artix-linux"
-
-    [[ -z ${account} ]] && account="[SetUser]"
-
-    [[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-    torrent_meta="$(get_osname)"
+    [[ -z ${ACCOUNT} ]] && ACCOUNT="naughtyISOuploader"
 }


@@ -118,9 +112,9 @@ load_config(){

    [[ -f $1 ]] || return 1

-    artools_conf="$1"
+    ARTOOLS_CONF="$1"

-    [[ -r ${artools_conf} ]] && source ${artools_conf}
+    [[ -r ${ARTOOLS_CONF} ]] && source ${ARTOOLS_CONF}

    init_artools_base

@@ -162,15 +156,15 @@ load_user_info(){
 }

 show_version(){
-    msg "artools"
-    msg2 "version: %s" "${version}"
+    msg "ARTOOLS"
+    msg2 "VERSION: %s" "${VERSION}"
 }

 show_config(){
    if [[ -f ${AT_USERCONFDIR}/artools.conf ]]; then
        msg2 "config: %s" "~/.config/artools/artools.conf"
    else
-        msg2 "config: %s" "${artools_conf}"
+        msg2 "config: %s" "${ARTOOLS_CONF}"
    fi
 }
Author	SHA1	Message	Date
artoo	81ebb6c399	buildtree: fix import new pkg	2018-12-11 11:45:35 +01:00
artoo	ea66cb27fc	migration of buildtree & commitpkg (#3 )	2018-12-10 21:57:27 +01:00
artoo	3e7c4e371c	deployiso: remove old Sf code	2018-11-18 17:54:10 +01:00
artoo	8dbd07ff55	deployiso: fix typo file_host, fix home path	2018-11-18 03:14:27 +01:00
artoo	d88ede3984	deployiso: switch to artix host commitpkg: only --clean on subrepo push	2018-11-18 03:00:28 +01:00
artoo	04a1da9dd9	util-pkg-subrepo: use --clean in pull and push	2018-11-15 12:16:00 +01:00
artoo	7eb70fcf2b	util-pkg: rm repo_map	2018-11-07 18:55:55 +01:00
artoo	16207221dc	deployiso: remove obsolete vars	2018-11-07 18:12:47 +01:00
artoo	daf58430a9	buildtree: use renamed func	2018-11-07 18:12:19 +01:00
artoo	8b32e346f6	util-pkg: rename func, small optimizations	2018-11-07 18:11:40 +01:00
artoo	8df5a87738	util: rm obsolete vars	2018-11-07 18:10:41 +01:00
artoo	e2dbe82949	upd artools.conf	2018-11-07 18:09:49 +01:00
artoo	38075ad5ad	buildiso: iso_label doesn't need a shared scope	2018-10-22 19:41:04 +02:00
artoo	a99a9c9699	capitals for input param	2018-10-22 12:18:14 +02:00
artoo	2cd876ade4	artools.conf: set default uplimit 1000	2018-10-22 12:16:57 +02:00
artoo	4eea0db73d	buildiso: fix user & host name	2018-10-22 01:52:45 +02:00
artoo	6f18d339df	var adjustments & fixes	2018-10-21 23:50:21 +02:00
artoo	d31ca02c2a	* start 0.10 * capitalize global vars	2018-10-21 17:31:17 +02:00
artoo	8a0cd5c236	util-iso*: remove old code	2018-10-21 14:35:40 +02:00
artoo	e300104dcf	util-pkg: improve find_repo() Makefile: clean up	2018-10-21 14:35:06 +02:00
artoo	a13f0079db	more clean up	2018-10-12 17:34:53 +02:00
artoo	cae48c0878	util-iso-profile: use @ operator to tag init specific pkgs	2018-10-09 16:53:52 +02:00
artoo	ce481f6b07	clean up	2018-10-08 19:36:28 +02:00
artoo	b6a4619ab3	mkchroot: add switch for mirrorlist copying	2018-10-08 17:09:19 +02:00
artoo	88ebc5c476	rm unused code	2018-10-08 16:49:43 +02:00
artoo	c27c516610	update artools.conf	2018-10-07 22:53:05 +02:00
artoo	42ee8522dd	deployiso: remove torrent support; will become a standalone wrapper eventually	2018-10-07 22:51:48 +02:00
artoo	b7f05f4dd2	util-iso: always include initsys in iso filename & if gremlins/goblins	2018-10-06 22:59:34 +02:00
artoo	f58e8b6c15	util-iso-yaml: add optional libpwquality check in user module	2018-10-03 11:11:02 +02:00
artoo	d432ffee3f	util-iso-yaml: remoive netinstall commented code util-iso: check for $log_dir	2018-10-03 10:22:31 +02:00
nous	961bc2cd59	Explicitly create log_dir and iso_root (#2 )	2018-10-03 04:18:54 +02:00
artoo	92aeff61d8	util-iso-grub: enable ucode util-iso-yaml: rm netinstall util-pkg-subrepo: simplify	2018-10-02 22:31:57 +02:00
artoo	64725482f8	update readme	2018-09-07 22:27:08 +02:00
artoo	11cd590529	util-iso-yaml: fix services in settings.conf	2018-09-07 22:19:26 +02:00
artoo	bb22741aa1	util-iso-grub: set pxe in base profile only	2018-09-07 17:34:52 +02:00
artoo	28e4b73964	util-iso-yaml: add dir options in services-openrc; fix runit svc typos	2018-09-06 19:29:57 +02:00
artoo	7ea0d6f475	util-iso-yaml: adopt upstream cal new services naming	2018-09-06 18:06:20 +02:00
artoo	bdcc22fd46	Makefile: remove uninstall & dist	2018-09-06 18:05:29 +02:00
artoo	3c2e97f915	buildtree: fix config arg on pull	2018-08-12 02:58:32 +02:00
artoo	ba77c20d77	buildtree: ch in proper dir in config	2018-08-12 02:48:47 +02:00
artoo	c376041a07	buildtree: fix it	2018-08-12 02:38:24 +02:00
artoo	bd29d360b4	buildtree: fix path	2018-08-12 02:34:47 +02:00
artoo	7e1b1ee238	nuildtree: configure repo after clone as well, its too later after pull only	2018-08-12 02:21:24 +02:00
artoo	221218ba2a	util-pkg: don't set localersion in kernel config	2018-08-09 01:54:48 +02:00
artoo	697d18da82	util-pkg-gitea: create compliant git repo	2018-08-07 21:47:34 +02:00