deployiso: remove old Sf code

commitpkg: only --clean on subrepo push

Makefile

@@ -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

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

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

bin/basestrap.in

@@ -8,7 +8,7 @@
 #  4) A valid mirror appears in /etc/pacman.d/mirrorlist
 #
 
-version=@version@
+VERSION=@version@
 
 shopt -s extglob
 

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 ;;

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"

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,7 +22,7 @@ import ${LIBDIR}/util-pkg-gitea.sh
 import ${LIBDIR}/util-pkg-subrepo.sh
 
 pull_tree_arch(){
-    cd ${tree_dir_arch}
+    cd ${TREE_DIR_ARCH}
     for tree in packages community;do
         if [[ -d ${tree} ]];then
             cd ${tree}
@@ -31,7 +31,7 @@ pull_tree_arch(){
             cd ..
         else
             msg "Cloning (%s) ..." "$tree"
-            clone_tree "${host_tree_arch}/${tree}"
+            clone_tree "${HOST_TREE_ARCH}/${tree}"
         fi
     done
 }
@@ -50,17 +50,17 @@ config_tree(){
 }
 
 pull_tree_artix(){
-    cd ${tree_dir_artix}
+    cd ${TREE_DIR_ARTIX}
     for tree in packages packages-galaxy;do
         if [[ -d ${tree} ]];then
+            config_tree "${tree}"
             cd ${tree}
-            config_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
@@ -69,7 +69,7 @@ pull_tree_artix(){
 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)
+        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
@@ -84,7 +84,7 @@ show_version_table(){
                 fi
                 if ${artix};then
                     if [ $(vercmp "$artixver" "$archver") -eq 0 ] || [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         case $ar in
                             *goblins)
                                 if [[ "$archrepo" == "$artixrepo" ]];then
@@ -104,17 +104,17 @@ show_version_table(){
                     fi
                 else
                     if [ $(vercmp "$artixver" "$archver") -lt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                     fi
                     if [ $(vercmp "$artixver" "$archver") -gt 0 ];then
-                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        local ar=$(find_artix_name "$artixrepo")
                         if [[ -n $archver ]] && [[ -n $archrepo ]];then
                             ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
                         fi
                     fi
                 fi
-                unset pkgver epoch pkgrel artixver archver _package
+                unset pkgver epoch pkgrel artixver archver
             fi
         done
     done
@@ -138,24 +138,24 @@ 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 pkg_path=${TREE_DIR_ARCH}/$git_tree_arch/$pkg
     local repo=$(find_repo "$pkg_path" "${unstable}")
 
     src=$pkg_path/repos/$repo
     $trunk && src=$pkg_path/trunk
 
-    local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
-    dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
+    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
+    cd ${TREE_DIR_ARCH}/$git_tree_arch
 
     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)
@@ -168,9 +168,9 @@ from_arch(){
         [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
         [[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
 
-        cd ${tree_dir_artix}/$git_tree_artix
+        cd ${TREE_DIR_ARTIX}/$git_tree_artix
 
-        dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
+        dest=${TREE_DIR_ARTIX}/$git_tree_artix/$pkg/trunk
 
         create_repo "$pkg"
         add_repo_to_team "$pkg" "$pkg_path"
@@ -184,10 +184,10 @@ from_arch(){
 
 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
@@ -205,7 +205,7 @@ display_settings(){
     show_config
 
     msg "OPTIONS:"
-    msg2 "package: %s" "${package}"
+    msg2 "PACKAGE: %s" "${PACKAGE}"
 
     msg "ARGS:"
     msg2 "sync: %s" "${sync}"
@@ -221,8 +221,8 @@ display_settings(){
     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
@@ -243,7 +243,7 @@ artix=false
 import=false
 view=false
 trunk=false
-package=''
+PACKAGE=''
 
 rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
 
@@ -274,7 +274,7 @@ opts='p:csudayiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) package="$OPTARG" ;;
+        p) PACKAGE="$OPTARG" ;;
         s) sync=true ;;
         z) sync_arch=false ;;
         c) compare=true ;;
@@ -294,15 +294,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}"

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@'
 

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() {

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@'
@@ -21,62 +21,62 @@ import ${LIBDIR}/util-pkg.sh
 import ${LIBDIR}/util-pkg-subrepo.sh
 
 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}"
             git pull origin master
-            subrepo_push "${package}"
+            subrepo_push "${PACKAGE}"
             sleep 1
             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 +85,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 +94,24 @@ 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}"
             git pull origin master
-            subrepo_push "${package}"
+            subrepo_push "${PACKAGE}"
             sleep 1
             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 +120,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 +135,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 +163,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 +177,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

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
 

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
@@ -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}"

bin/find-libdeps.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@'
 

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@'
 

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
 

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@'
 

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"
 

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=$?

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[@]}"

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@'
 

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]

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

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}"

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" \

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}"
-}

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
 }

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"

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
+}
+

lib/util-pkg-gitea.sh

@@ -21,13 +21,13 @@ get_compliant_name(){
 create_repo(){
     local pkg="$1"
     local gitname=$(get_compliant_name "$pkg")
-    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\":\"$gitname\", \"readme\": \"Default\" }"
+    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\":\"$gitname\", \"readme\": \"Default\" }"
 }
 
 delete_repo(){
     local pkg="$1"
     local gitname=$(get_compliant_name "$pkg")
-    curl -X DELETE "${git_url}/api/v1/repos/packages/$gitname?access_token=${git_token}" -H  "accept: application/json"
+    curl -X DELETE "${GIT_URL}/api/v1/repos/packages/$gitname?access_token=${GIT_TOKEN}" -H  "accept: application/json"
 }
 
 find_team(){
@@ -55,5 +55,5 @@ add_repo_to_team(){
     local pkg="$1" path="$2"
     local id=$(find_team "$path")
 
-    curl -X PUT "${git_url}/api/v1/teams/$id/repos/packages/$pkg?access_token=${git_token}" -H  "accept: application/json"
+    curl -X PUT "${GIT_URL}/api/v1/teams/$id/repos/packages/$pkg?access_token=${GIT_TOKEN}" -H  "accept: application/json"
 }

lib/util-pkg-subrepo.sh

@@ -10,21 +10,21 @@
 # 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
+    local pkg="$1" branch=master org=packages
+    git subrepo init "$pkg" -r gitea@"${GIT_DOMAIN}":"$org"/"$pkg".git -b "$branch"
 }
 
 subrepo_push(){
-    local pkg="$1"
-    git subrepo push -u "$pkg" -b master
+    local pkg="$1" branch=master
+    git subrepo push "$pkg" -u -b "$branch" --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" name="${2:-$1}" branch=master org=packages
+    git subrepo pull "$pkg" -r gitea@"${GIT_DOMAIN}":"$org"/"$name".git -u -b "$branch" #--clean
 }
 
 subrepo_clone(){
-    local pkg="$1" name="${2:-$1}"
-    git subrepo clone gitea@gitea.artixlinux.org:packages/$pkg.git "$name" -b master
+    local pkg="$1" name="${2:-$1}" branch=master org=packages
+    git subrepo clone gitea@"${GIT_DOMAIN}":"$org"/"$name".git "$pkg" -b "$branch"
 }

lib/util-pkg.sh

@@ -117,8 +117,8 @@ push_tree(){
 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 ;;
+        packages) import_path=${TREE_DIR_ARCH}/packages ;;
+        packages-galaxy) import_path=${TREE_DIR_ARCH}/community ;;
     esac
     echo $import_path
 }
@@ -133,84 +133,19 @@ is_valid_repo(){
 
 find_repo(){
     local pkg="$1" unst="$2" stag="$3" repo=
+    local repos=(core extra testing community community-testing mulitilib multilib-testing)
 
-    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
+    $stag && repos+=(staging community-staging mulitilib-staging)
+    $unst && repos+=(gnome-unstable kde-unstable)
 
-    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
+    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
 }
 
-arch_to_artix_repo(){
+find_artix_name(){
     local repo="$1"
     case $repo in
         core-*) repo=system ;;

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}/artix"
 
-    [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
+    [[ -z ${HOST_TREE_ARTIX} ]] && HOST_TREE_ARTIX="gitea@${GIT_DOMAIN}:artix"
 
-    [[ -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
 }