artools/0.27 (#62)

* refactoring
* drop echo

Reviewed-on: artix/artools#62

Makefile

@@ -1,4 +1,4 @@
-V=0.26
+V=0.27
 
 TOOLS = artools
 PREFIX ?= /usr
@@ -40,7 +40,8 @@ PKG_BIN = \
 	bin/pkg/batchpkg \
 	bin/pkg/signpkg \
 	bin/pkg/checkrepo \
-	bin/pkg/gitearepo
+	bin/pkg/gitearepo \
+	bin/pkg/tidyarch
 
 LN_COMMITPKG = \
 	extrapkg \

bin/base/artix-chroot.in

@@ -35,7 +35,7 @@ chroot_part_umount() {
 detect(){
     local detected
     detected="$(os-prober | tr ' ' '_' | paste -s -d ' ')"
-    echo "${detected}"
+    printf "%s\n" "${detected}"
 }
 
 # $1: os-prober array
@@ -44,7 +44,7 @@ get_os_name(){
     str="${str#*:}"
     str="${str#*:}"
     str="${str%:*}"
-    echo "$str"
+    printf "%s\n" "$str"
 }
 
 mount_os(){
@@ -106,16 +106,16 @@ select_os(){
 automount=false
 
 usage() {
-    echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
+    printf 'usage: %s -a [or] %s chroot-dir [command]\n' "${0##*/}" "${0##*/}"
-    echo '    -a             Automount detected linux system'
+    printf '    -a             Automount detected linux system\n'
-    echo '    -h             Print this help message'
+    printf '    -h             Print this help message\n'
-    echo ''
+    printf '\n'
-    echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
+    printf "    If 'command' is unspecified, %s will launch /bin/sh.\n" "${0##*/}"
-    echo ''
+    printf '\n'
-    echo "    If 'automount' is true, ${0##*/} will launch /bin/bash"
+    printf "    If 'automount' is true, %s will launch /bin/bash\n" "${0##*/}"
-    echo "    and ${chrootdir}."
+    printf '    and %s\n' "${chrootdir}"
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -125,7 +125,6 @@ while getopts ${opts} arg; do
     case "${arg}" in
         a) automount=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument ${arg}"; usage 1 ;;
     esac
 done
 shift $(( OPTIND - 1 ))

bin/base/basestrap.in

@@ -55,19 +55,19 @@ copymirrorlist=1
 pacmode=-Sy
 
 usage() {
-    echo "usage: ${0##*/} [options] root [packages...]"
+    printf "usage: %s [options] root [packages...]\n" "${0##*/}"
-    echo " -C <config>      Use an alternate config file for pacman"
+    printf " -C <config>      Use an alternate config file for pacman\n"
-    echo " -c               Use the package cache on the host, rather than the target"
+    printf " -c               Use the package cache on the host, rather than the target\n"
-    echo " -G               Avoid copying the host's pacman keyring to the target"
+    printf " -G               Avoid copying the host's pacman keyring to the target\n"
-    echo " -i               Avoid auto-confirmation of package selections"
+    printf " -i               Avoid auto-confirmation of package selections\n"
-    echo " -M               Avoid copying the host's mirrorlist to the target"
+    printf " -M               Avoid copying the host's mirrorlist to the target\n"
-    echo ' -U               Use pacman -U to install packages'
+    printf ' -U               Use pacman -U to install packages\n'
-    echo " -h               Print this help message"
+    printf " -h               Print this help message\n"
-    echo ''
+    printf '\n'
-    echo ' basestrap installs packages to the specified new root directory.'
+    printf ' basestrap installs packages to the specified new root directory.\n'
-    echo ' If no packages are given, basestrap defaults to the "base" group.'
+    printf ' If no packages are given, basestrap defaults to the "base" group.\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -81,8 +81,7 @@ while getopts ${opts} arg; do
         G) copykeyring=0 ;;
         M) copymirrorlist=0 ;;
         U) pacmode=-U ;;
-        :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
+        h|?) usage 0 ;;
-        ?) usage 0 ;;
     esac
 done
 shift $(( OPTIND - 1 ))

bin/base/chroot-run.in

@@ -45,18 +45,18 @@ files=()
 mount_args=("-B:/etc/hosts:/etc/hosts")
 
 usage() {
-    echo "Usage: ${0##*/} [options] working-dir [run arguments]"
+    printf "Usage: %s [options] working-dir [run arguments]\n" "${0##*/}"
-    echo "A wrapper around chroot. Provides support for pacman."
+    printf "A wrapper around chroot. Provides support for pacman.\n"
-    echo
+    printf '\n'
-    echo ' options:'
+    printf ' options:\n'
-    echo '    -C <file>     Location of a pacman config file'
+    printf '    -C <file>     Location of a pacman config file\n'
-    echo '    -M <file>     Location of a makepkg config file'
+    printf '    -M <file>     Location of a makepkg config file\n'
-    echo '    -c <dir>      Set pacman cache'
+    printf '    -c <dir>      Set pacman cache\n'
-    echo '    -f <file>     Copy file from the host to the chroot'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
-    echo '    -s            Do not run setarch'
+    printf '    -s            Do not run setarch\n'
-    echo '    -b <list>     Bind mountargs'
+    printf '    -b <list>     Bind mountargs\n'
-    echo '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]'
+    printf '                  List format [mntarg1:src1:dest1 ... mntargN:srcN:destN]\n'
-    echo '    -h            This message'
+    printf '    -h            This message\n'
     exit 1
 }
 
@@ -71,7 +71,6 @@ while getopts ${opts} arg; do
         s) nosetarch=1 ;;
         b) bindmounts+=("$OPTARG"); mount_args+=(${bindmounts[@]}) ;;
         h|?) usage ;;
-        *) error "invalid argument '$arg'"; usage ;;
     esac
 done
 shift $(( OPTIND - 1 ))
@@ -95,7 +94,7 @@ host_mirrors=($(pacman-conf --repo world Server 2> /dev/null | sed -r 's#(.*/)wo
 for host_mirror in "${host_mirrors[@]}"; do
     if [[ $host_mirror == *file://* ]]; then
         # shellcheck disable=2016
-        host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+        host_mirror=$(printf "%s\n" "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
         in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror")
     fi
 done

bin/base/mkchroot.in

@@ -23,15 +23,15 @@ files=()
 chroot_args=()
 
 usage() {
-    echo "Usage: ${0##*/} [options] working-dir package-list..."
+    printf "Usage: %s [options] working-dir package-list...\n" "${0##*/}"
-    echo ' options:'
+    printf ' options:\n'
-    echo '    -U            Use pacman -U to install packages'
+    printf '    -U            Use pacman -U to install packages\n'
-    echo '    -C <file>     Location of a pacman config file'
+    printf '    -C <file>     Location of a pacman config file\n'
-    echo '    -M <file>     Location of a makepkg config file'
+    printf '    -M <file>     Location of a makepkg config file\n'
-    echo '    -c <dir>      Set pacman cache'
+    printf '    -c <dir>      Set pacman cache\n'
-    echo '    -f <file>     Copy file from the host to the chroot'
+    printf '    -f <file>     Copy file from the host to the chroot\n'
-    echo '    -s            Do not run setarch'
+    printf '    -s            Do not run setarch\n'
-    echo '    -h            This message'
+    printf '    -h            This message\n'
     exit 1
 }
 
@@ -46,7 +46,6 @@ while getopts ${opts} arg; do
         f) files+=("$OPTARG") ;;
         s) nosetarch=1 ;;
         h|?) usage ;;
-        *) error "invalid argument '%s'" "$arg"; usage ;;
     esac
     if [[ $arg != U ]]; then
         chroot_args+=("-$arg")
@@ -95,9 +94,9 @@ basestrap -${umode}Mc ${pacman_conf:+-C "$pacman_conf"} "$working_dir" \
     "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
-echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
+printf 'LANG=en_US.UTF-8\n' > "$working_dir/etc/locale.conf"
-# echo 'KEYMAP=en' > "$working_dir/etc/vconsole.conf"
+# printf 'KEYMAP=en\n' > "$working_dir/etc/vconsole.conf"
-echo "${CHROOTVERSION}" > "$working_dir/.artools"
+printf "%s\n" "${CHROOTVERSION}" > "$working_dir/.artools"
 
 dbus-uuidgen --ensure="$working_dir"/etc/machine-id
 

bin/iso/buildiso.in

@@ -181,7 +181,7 @@ gen_iso_fn(){
     for n in "${vars[@]}"; do
         name=${name:-}${name:+-}${n}
     done
-    echo "$name"
+    printf "%s\n" "$name"
 }
 
 prepare_build(){
@@ -325,28 +325,28 @@ chroots_iso="${CHROOTS_DIR}/buildiso"
 arch=$(uname -m)
 
 usage() {
-    echo "Usage: ${cmd} [options]"
+    printf 'Usage: %s [options]\n' "${cmd}"
-    echo "    -p <profile>       Profile [default: ${profile}]"
+    printf '    -p <profile>       Profile [default: %s]\n' "${profile}"
-    echo '    -r <dir>           Chroots directory'
+    printf '    -r <dir>           Chroots directory\n'
-    echo "                       [default: ${chroots_iso}]"
+    printf '                       [default: %s]\n' "${chroots_iso}"
-    echo '    -t <dir>           Target directory'
+    printf '    -t <dir>           Target directory\n'
-    echo "                       [default: ${ISO_POOL}]"
+    printf '                       [default: %s]\n' "${ISO_POOL}"
-    echo '    -i <name>          Init system to use'
+    printf '    -i <name>          Init system to use\n'
-    echo "                       [default: ${INITSYS}]"
+    printf '                       [default: %s]\n' "${INITSYS}"
-    echo '    -g <key>           The gpg key for img signing'
+    printf '    -g <key>           The gpg key for img signing\n'
-    echo "                       [default: none]"
+    printf '                       [default: none]\n'
-    echo '    -m                 Set SquashFS image mode to persistence'
+    printf '    -m                 Set SquashFS image mode to persistence\n'
-    echo '    -c                 Disable clean work dir'
+    printf '    -c                 Disable clean work dir\n'
-    echo '    -x                 Build chroot only'
+    printf '    -x                 Build chroot only\n'
-    echo '    -s                 Squash chroot only'
+    printf '    -s                 Squash chroot only\n'
-    echo '    -b                 Generate iso boot only'
+    printf '    -b                 Generate iso boot only\n'
-    echo '    -z                 Generate iso only'
+    printf '    -z                 Generate iso only\n'
-    echo '                       Requires pre built images (-x)'
+    printf '                       Requires pre built images (-x)\n'
-    echo '    -d                 Use dracut instead of mkinitcpio for iso initramfs'
+    printf '    -d                 Use dracut instead of mkinitcpio for iso initramfs\n'
-    echo '    -q                 Query settings and pretend build'
+    printf '    -q                 Query settings and pretend build\n'
-    echo '    -h                 This help'
+    printf '    -h                 This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -368,7 +368,6 @@ while getopts "${opts}" arg; do
         d) use_dracut=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/batchpkg.in

@@ -76,13 +76,13 @@ batch_update() {
 #}}}
 
 usage() {
-    echo "Usage: ${0##*/} [optional listname]"
+    printf 'Usage: %s [optional listname]\n' "${0##*/}"
-    echo '    -r                 Run generated commands'
+    printf '    -r                 Run generated commands\n'
-    echo '    -c                 Create subrepos from list'
+    printf '    -c                 Create subrepos from list\n'
-    echo '    -u                 Update subrepos from list'
+    printf '    -u                 Update subrepos from list\n'
-    echo '    -h                 This help'
+    printf '    -h                 This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -98,7 +98,6 @@ while getopts "${opts}" arg; do
         c) create=true ;;
         u) update=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/buildpkg.in

@@ -29,17 +29,17 @@ chroots_pkg="${CHROOTS_DIR}/buildpkg"
 arch=$(uname -m)
 
 usage() {
-    echo "Usage: ${0##*/} [options] -- [mkchrootpkg_args]"
+    printf 'Usage: %s [options] -- [mkchrootpkg_args]\n' "${0##*/}"
-    echo "    -r <dir>           Create chroots in this directory"
+    printf '    -r <dir>           Create chroots in this directory\n'
-    echo "    -d <dir>           Destination repo chroot"
+    printf '    -d <dir>           Destination repo chroot\n'
-    echo '    -c                 Recreate the chroot before building'
+    printf '    -c                 Recreate the chroot before building\n'
-    echo '    -m                 Major rebuild'
+    printf '    -m                 Major rebuild\n'
-    echo '    -N                 Disable check() function'
+    printf '    -N                 Disable check() function\n'
-    echo '    -C                 Run checkpkg after built'
+    printf '    -C                 Run checkpkg after built\n'
-    echo '    -h                 This help'
+    printf '    -h                 This help\n'
-    echo ''
+    printf '\n'
-    echo "Default mkchrootpkg_args args: ${mkchrootpkg_args[*]}"
+    printf 'Default mkchrootpkg_args args: %s\n' "${mkchrootpkg_args[*]}"
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -54,7 +54,6 @@ while getopts "${opts}" arg; do
         C) mkchrootpkg_args+=(-C) ;;
         N) mkchrootpkg_args+=(-N) ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
 done
 

bin/pkg/buildtree.in

@@ -23,15 +23,6 @@ m4_include(lib/pkg/jenkins.sh)
 
 #{{{ new git repo
 
-subrepo_clone(){
-    local pkg="$1"
-    local org="$2"
-    local name="$3"
-
-    msg2 "Subrepo clone [%s] from (%s)" "$pkg" "$org/$name"
-    git subrepo clone "${GIT_SSH}":"$org"/"$name".git "$pkg"
-}
-
 subrepo_new(){
     cd "${TREE_DIR_ARTIX}/${group}" || return
 
@@ -43,9 +34,10 @@ subrepo_new(){
 
     add_team_to_repo "$gitname" "$org" "${team}"
 
-    subrepo_clone "${package}" "$org" "$gitname"
+    msg2 "Subrepo clone [%s] from (%s)" "${package}" "$org/$gitname"
+    git subrepo clone "${GIT_SSH}":"$org/$gitname".git "${package}"
 
-    mkdir -p "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
+    prepare_dir "${TREE_DIR_ARTIX}/${group}/${package}/trunk"
 
     commit_jenkins_files "${package}"
 }
@@ -54,30 +46,15 @@ subrepo_new(){
 
 #{{{ pull
 
-clone_tree(){
-    local url="$1" tree="$2" os="${3:-Artix}"
-
-    msg "Cloning %s (%s) ..." "$tree" "$os"
-
-    git clone "$url/$tree".git
-}
-
-pull_tree_arch(){
-    cd "${TREE_DIR_ARCH}" || return
-    for tree in "${ARCH_TREE[@]}";do
-        if [[ -d "${tree}" ]];then
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)" "Arch"
-            )
-        else
-            clone_tree "${HOST_TREE_ARCH}" "${tree}" "Arch"
-        fi
-    done
-}
-
 config_tree() {
-    local tree="$1"
+    local dist="$1" vars="${2:-false}"
-    cd "$tree" || return
+    case "$dist" in
+        Artix)
+            if "$vars"; then
+                dist_tree=("${ARTIX_TREE[@]}")
+                dist_url="${GIT_SSH}:artixlinux"
+                dist_dir=${TREE_DIR_ARTIX}
+            else
                 git config --bool pull.rebase true
                 git config commit.gpgsign true
                 if [[ -n "${GPGKEY}" ]];then
@@ -85,26 +62,38 @@ config_tree(){
                 else
                     warning "No GPGKEY configured in makepkg.conf!"
                 fi
-    cd ..
+            fi
+        ;;
+        Arch)
+            if "$vars"; then
+                dist_tree=("${ARCH_TREE[@]}")
+                dist_url="${HOST_TREE_ARCH}"
+                dist_dir=${TREE_DIR_ARCH}
+            else
+                git config --bool pull.rebase false
+                git config branch.master.mergeoptions --no-edit
+            fi
+        ;;
+    esac
 }
 
-pull_tree_artix(){
+update_tree() {
-    local repos=()
+    local dist="${1:-Artix}"
-    if ${sync_group}; then
+    config_tree "$dist" true
-        repos=("${group}")
+    cd "$dist_dir" || return
-    else
+    for tree in "${dist_tree[@]}"; do
-        repos=("${ARTIX_TREE[@]}")
+        if [[ -d "$tree" ]]; then
-    fi
+            ( cd "$tree" || return
-    cd "${TREE_DIR_ARTIX}" || return
+                config_tree "$dist"
-    for tree in "${repos[@]}"; do
+                msg "Checking (%s) (%s)" "$tree" "$dist"
-        if [[ -d "${tree}" ]];then
+                pull_tree "$tree" "$(get_local_head)"
-            config_tree "${tree}"
-            ( cd "${tree}" || return
-                pull_tree "${tree}" "$(get_local_head)"
             )
         else
-            clone_tree "${host_tree_artix}" "${tree}"
+            msg "Cloning (%s) (%s) ..." "$tree" "$dist"
-            config_tree "${tree}"
+            git clone "$dist_url/$tree".git
+            ( cd "$tree" || return
+                config_tree "$dist"
+            )
         fi
     done
 }
@@ -243,8 +232,8 @@ check_tree(){
 }
 
 sync_repos(){
-    ${sync_arch} && pull_tree_arch
+    ${sync_arch} && update_tree "Arch"
-    ${sync_artix} && pull_tree_artix
+    ${sync_artix} && update_tree
 }
 
 load_makepkg_config
@@ -261,7 +250,6 @@ sync_artix=true
 import=false
 view=false
 createnew=false
-sync_group=false
 check=false
 
 package=''
@@ -269,29 +257,27 @@ package=''
 team='community'
 group="${ARTIX_TREE[0]}"
 
-host_tree_artix="${GIT_SSH}:artixlinux"
-
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    printf "Usage: %s [options]\n" "${0##*/}"
-    echo '    -p <pkg>      Package name'
+    printf '    -p <pkg>      Package name\n'
-    echo '    -t <team>     Team name (only with -n)'
+    printf '    -t <team>     Team name (only with -n)\n'
-    echo '                  Possible values: core,extra,community,multilib'
+    printf '                  Possible values: core,extra,community,multilib\n'
-    echo "                  [default: ${team}]"
+    printf "                  [default: %s]\n" "${team}"
-    echo '    -g <group>    Group name, the superrepo (only with -n or -s)'
+    printf '    -g <group>    Group name, the superrepo (only with -n)\n'
-    echo "                  [default: ${group}]"
+    printf "                  [default: %s]\n" "${group}"
-    echo "    -s            Clone or pull repos"
+    printf "    -s            Clone or pull repos\n"
-    echo "    -a            Don't clone or pull arch repos"
+    printf "    -a            Don't clone or pull arch repos\n"
-    echo "    -b            Don't clone or pull artix repos"
+    printf "    -b            Don't clone or pull artix repos\n"
-    echo '    -i            Import a package from arch repos'
+    printf '    -i            Import a package from arch repos\n'
-    echo '    -n            New remote subrepo and clone it'
+    printf '    -n            New remote subrepo and clone it\n'
-    echo '    -v            Check if a package is in the artix tree(s)'
+    printf '    -v            Check if a package is in the artix tree(s)\n'
-    echo '    -c            View package depends'
+    printf '    -c            View package depends\n'
-    echo '    -x            Exclude testing (only with -i)'
+    printf '    -x            Exclude testing (only with -i)\n'
-    echo '    -y            Exclude staging (only with -i)'
+    printf '    -y            Exclude staging (only with -i)\n'
-    echo '    -z            Include kde & gnome unstable (only with -i)'
+    printf '    -z            Include kde & gnome unstable (only with -i)\n'
-    echo '    -h            This help'
+    printf '    -h            This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -301,7 +287,7 @@ while getopts "${opts}" arg; do
     case "${arg}" in
         p) package="$OPTARG" ;;
         t) team="$OPTARG" ;;
-        g) group="$OPTARG"; sync_group=true ;;
+        g) group="$OPTARG" ;;
         s) sync=true ;;
         a) sync_arch=false ;;
         b) sync_artix=false ;;
@@ -313,7 +299,6 @@ while getopts "${opts}" arg; do
         y) staging=false ;;
         z) unstable=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/checkpkg.in

@@ -197,7 +197,7 @@ for _pkgname in "${pkgname[@]}"; do
     if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
         message="Sonames differ in $_pkgname!"
         (( WARN )) && warning "$message" || msg "$message"
-        echo "$diff_output"
+        printf "%s\n" "$diff_output"
     else
         msg "No soname differences for %s." "$_pkgname"
     fi

bin/pkg/checkrepo.in

@@ -129,14 +129,14 @@ show_obsolete_table() {
 
         if [[ "$p" != *openrc* ]] && [[ "$p" != *runit* ]] \
         && [[ "$p" != *s6* ]] && [[ "$p" != *suite66* ]] \
-        && [[ "$p" != *eudev* ]] && [[ "$p" != *elogind* ]] \
+        && [[ "$p" != *udev* ]] && [[ "$p" != *elogind* ]] \
         && [[ "$p" != *sysusers* ]] && [[ "$p" != *tmpfiles* ]] \
         && [[ "$p" != *execline* ]] && [[ "$p" != *skalibs* ]] \
         && [[ "$p" != *netifrc* ]] && [[ "$p" != *bootlogd* ]] \
         && [[ "$p" != *pam_rundir* ]] && [[ "$p" != *artools* ]] \
         && [[ "$p" != *archlinux* ]] && [[ "$p" != *iso-profiles* ]] \
         && [[ "$p" != *calamares* ]] && [[ "$p" != *iso-initcpio* ]] \
-        && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]]; then
+        && [[ "$p" != *dinit* ]] && [[ "$p" != *artix* ]] && [[ "$p" != *blocaled* ]]; then
             if [[ ! -d "${arch_db}/$p" ]]; then
                 msg_row "${tableQ}" "${artix_repo}" "$p" "true"
             fi
@@ -209,17 +209,17 @@ searchrepos=(
 #}}}
 
 usage() {
-    echo "Usage: ${0##*/} [options] (with -q [libname])"
+    printf "Usage: %s [options] (with -q [libname])\n" "${0##*/}"
-    echo '    -r <repo>     Repo name to query'
+    printf '    -r <repo>     Repo name to query\n'
-    echo '                  [default: all]'
+    printf '                  [default: all]\n'
-    echo "    -s            Sync repo databases"
+    printf "    -s            Sync repo databases\n"
-    echo '    -c            Check repos'
+    printf '    -c            Check repos\n'
-    echo '    -a            Show repo db (-c)'
+    printf '    -a            Show repo db (-c)\n'
-    echo '    -o            Check for obsolete packages'
+    printf '    -o            Check for obsolete packages\n'
-    echo "    -q            Query repo databases for so libs"
+    printf "    -q            Query repo databases for so libs\n"
-    echo '    -h            This help'
+    printf '    -h            This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -234,7 +234,6 @@ while getopts "${opts}" arg; do
         q) query=true ;;
         o) obsolete=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/commitpkg.in

@@ -82,11 +82,11 @@ path_config() {
 }
 
 get_repo_commit_msg() {
-    echo "[${repo_src}] -> [${repo_dest}] '${package}-$(get_full_version)' ${action}"
+    printf "[%s] -> [%s] '%s' %s\n" "${repo_src}" "${repo_dest}" "${package}-$(get_full_version)" "${action}"
 }
 
 get_commit_msg() {
-    echo "[${repo_src}] '${package}-$(get_full_version)' ${action}"
+    printf "[%s] '%s' %s\n" "${repo_src}" "${package}-$(get_full_version)" "${action}"
 }
 
 commit_pkg() {
@@ -154,8 +154,11 @@ run(){
 
         cd "${group}" || return
 
-        ${push} && pull_tree "${group##*/}" "$head"
+        if ${push}; then
-#         subrepo_pull "${package}"
+            msg "Checking (%s) (Artix)" "${group##*/}"
+            pull_tree "${group##*/}" "$head"
+        fi
+
         subrepo_push "${package}"
         subrepo_clean "${package}"
 
@@ -197,14 +200,14 @@ cmd=${0##*/}
 repo_dest=${cmd%pkg}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    printf "Usage: %s [options]\n" "${0##*/}"
-    echo "    -s <name>          Source repository [default:${repo_src}]"
+    printf "    -s <name>          Source repository [default: %s]\n" "${repo_src}"
-    echo '    -p <pkg>           Package name'
+    printf '    -p <pkg>           Package name\n'
-    echo '    -r                 Delete from repo (commitpkg only)'
+    printf '    -r                 Delete from repo (commitpkg only)\n'
-    echo '    -u                 Push'
+    printf '    -u                 Push\n'
-    echo '    -h                 This help'
+    printf '    -h                 This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -217,7 +220,6 @@ while getopts "${opts}" arg; do
         r) remove=true ;;
         u) push=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/comparepkg.in

@@ -74,7 +74,7 @@ get_archpath(){
     for tree in "${ARCH_TREE[@]}"; do
         [[ -d ${TREE_DIR_ARCH}/$tree/$pkg/repos ]] && archpath=${TREE_DIR_ARCH}/$tree/$pkg
     done
-    echo "$archpath"
+    printf "%s\n" "$archpath"
 }
 
 pre_compare(){
@@ -168,16 +168,16 @@ move=false
 readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    printf 'Usage: %s [options]\n' "${0##*/}"
-    echo '    -u            Show upgrade packages'
+    printf '    -u            Show upgrade packages\n'
-    echo '    -d            Show downgrade packages'
+    printf '    -d            Show downgrade packages\n'
-    echo '    -m            Show packages to move'
+    printf '    -m            Show packages to move\n'
-    echo "    -x            Don't inlcude testing packages"
+    printf '    -x            Do not inlcude testing packages\n'
-    echo "    -y            Don't inlcude staging packages"
+    printf '    -y            Do not inlcude staging packages\n'
-    echo '    -z            Include unstable kde and gnome'
+    printf '    -z            Include unstable kde and gnome\n'
-    echo '    -h            This help'
+    printf '    -h            This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -192,7 +192,6 @@ while getopts "${opts}" arg; do
         y) staging=false ;;
         z) unstable=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/deploypkg.in

@@ -61,14 +61,14 @@ cmd=${0##*/}
 dest_repo=${cmd#*-}
 
 usage() {
-    echo "Usage: ${cmd} [options]"
+    printf "Usage: %s [options]\n" "${cmd}"
-    echo '    -d <dest>          Destination repository'
+    printf '    -d <dest>          Destination repository\n'
-    echo '    -a                 Add package(s) to repository'
+    printf '    -a                 Add package(s) to repository\n'
-    echo '    -r                 Remove package(s) from repository'
+    printf '    -r                 Remove package(s) from repository\n'
-    echo '    -l                 Use links db'
+    printf '    -l                 Use links db\n'
-    echo '    -h                 This help'
+    printf '    -h                 This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -81,7 +81,6 @@ while getopts "${opts}" arg; do
         r) rm_pkg=true; add_pkg=false ;;
         l) linksdb=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/find-libdeps.in

@@ -32,9 +32,9 @@ case $script_mode in
 esac
 
 if [[ -z $1 ]]; then
-    echo "${0##*/} [options] <package file|extracted package dir>"
+    printf "%s [options] <package file|extracted package dir>\n" "${0##*/}"
-    echo "Options:"
+    printf "Options:\n"
-    echo "    --ignore-internal      ignore internal libraries"
+    printf "    --ignore-internal      ignore internal libraries\n"
     exit 1
 fi
 
@@ -61,7 +61,7 @@ process_sofile() {
     fi
     if ! in_array "${soname}=${soversion}-${soarch}" "${soobjects[@]}"; then
         # libfoo.so=1-64
-        echo "${soname}=${soversion}-${soarch}"
+        printf "%s\n" "${soname}=${soversion}-${soarch}"
         soobjects+=("${soname}=${soversion}-${soarch}")
     fi
 }

bin/pkg/finddeps.in

@@ -17,11 +17,11 @@ m4_include(lib/base/message.sh)
 match=$1
 
 if [[ -z $match ]]; then
-    echo 'Usage: finddeps <depname>'
+    printf 'Usage: finddeps <depname>\n'
-    echo ''
+    printf '\n'
-    echo 'Find packages that depend on a given depname.'
+    printf 'Find packages that depend on a given depname.\n'
-    echo 'Run this script from the top-level directory of your ABS tree.'
+    printf 'Run this script from the top-level directory of your ABS tree.\n'
-    echo ''
+    printf '\n'
     exit 1
 fi
 

bin/pkg/gitearepo.in

@@ -55,13 +55,13 @@ transfer_repo() {
 #}}}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    printf "Usage: %s [options]\n" "${0##*/}"
-    echo '    -r <repo>     Repo name'
+    printf '    -r <repo>     Repo name\n'
-    echo '    -c            Create git repo'
+    printf '    -c            Create git repo\n'
-    echo '    -t            Transfer git repo to landfill org'
+    printf '    -t            Transfer git repo to landfill org\n'
-    echo '    -h            This help'
+    printf '    -h            This help\n'
-    echo ''
+    printf '\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -76,7 +76,6 @@ while getopts "${opts}" arg; do
         c) create=true ;;
         t) transfer=true ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/lddd.in

@@ -40,7 +40,7 @@ for tree in $PATH $libdirs $extras; do
             #  Is an ELF binary.
             if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                 #  Missing lib.
-                echo "$i:" >> "$TEMPDIR/raw.txt"
+                printf "%s\n" "$i:" >> "$TEMPDIR/raw.txt"
                 ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
             fi
         fi

bin/pkg/links-add.in

@@ -87,7 +87,7 @@ find_pkgentry() {
     for pkgentry in "$tmpdir/${REPO_DB_NAME}/$pkgname"*; do
         name=${pkgentry##*/}
         if [[ ${name%-*-*} = "$pkgname" ]]; then
-            echo "$pkgentry"
+            printf "%s\n" "$pkgentry"
             return 0
         fi
     done
@@ -238,7 +238,7 @@ db_remove_entry() {
 
         # remove entries in "links" database
         local linksentry
-        linksentry=$(echo "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
+        linksentry=$(printf "%s\n" "$pkgentry" | sed 's/\(.*\)\/db\//\1\/links\//')
         rm -rf "$linksentry"
 
         pkgentry=$(find_pkgentry "$pkgname")
@@ -258,7 +258,7 @@ prepare_repo_db() {
     fi
 
     # check lock file
-    if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then
+    if ( set -o noclobber; printf "%s\n" "$$" > "$LOCKFILE") 2> /dev/null; then
         CLEAN_LOCK=1
     else
         error "Failed to acquire lockfile: %s." "$LOCKFILE"
@@ -399,7 +399,7 @@ trap_exit() {
     # unhook all traps to avoid race conditions
     trap '' EXIT TERM HUP QUIT INT ERR
 
-    echo
+    printf '\n'
     error "$@"
     clean_up 1
 }

bin/pkg/mkchrootpkg.in

@@ -44,43 +44,43 @@ copy=$USER
 src_owner=${SUDO_USER:-$USER}
 
 usage() {
-    echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
+    printf 'Usage: %s [options] -r <chrootdir> [--] [makepkg args]\n' "${0##*/}"
-    echo ' Run this script in a PKGBUILD dir to build a package inside a'
+    printf ' Run this script in a PKGBUILD dir to build a package inside a\n'
-    echo ' clean chroot. Arguments passed to this script after the'
+    printf ' clean chroot. Arguments passed to this script after the\n'
-    echo ' end-of-options marker (--) will be passed to makepkg.'
+    printf ' end-of-options marker (--) will be passed to makepkg.\n'
-    echo ''
+    printf '\n'
-    echo ' The chroot dir consists of the following directories:'
+    printf ' The chroot dir consists of the following directories:\n'
-    echo ' <chrootdir>/{root, copy} but only "root" is required'
+    printf ' <chrootdir>/{root, copy} but only "root" is required\n'
-    echo ' by default. The working copy will be created as needed'
+    printf ' by default. The working copy will be created as needed\n'
-    echo ''
+    printf '\n'
-    echo 'The chroot "root" directory must be created via the following'
+    printf "The chroot 'root' directory must be created via the following\n"
-    echo 'command:'
+    printf 'command:\n'
-    echo '    mkchroot <chrootdir>/root base-devel'
+    printf '    mkchroot <chrootdir>/root base-devel\n'
-    echo ''
+    printf '\n'
-    echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER'
+    printf 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER\n'
-    echo 'from makepkg.conf(5), if those variables are not part of the'
+    printf 'from makepkg.conf(5), if those variables are not part of the\n'
-    echo 'environment.'
+    printf 'environment.\n'
-    echo ''
+    printf '\n'
-    echo "Default makepkg args: ${default_makepkg_args[*]}"
+    printf 'Default makepkg args: %s\n' "${default_makepkg_args[*]}"
-    echo ''
+    printf '\n'
-    echo 'Flags:'
+    printf 'Flags:\n'
-    echo '-h         This help'
+    printf ' -h         This help\n'
-    echo '-c         Clean the chroot before building'
+    printf ' -c         Clean the chroot before building\n'
-    echo '-d <dir>   Bind directory into build chroot as read-write'
+    printf ' -d <dir>   Bind directory into build chroot as read-write\n'
-    echo '-D <dir>   Bind directory into build chroot as read-only'
+    printf ' -D <dir>   Bind directory into build chroot as read-only\n'
-    echo '-u         Update the working copy of the chroot before building'
+    printf ' -u         Update the working copy of the chroot before building\n'
-    echo '           This is useful for rebuilds without dirtying the pristine'
+    printf '           This is useful for rebuilds without dirtying the pristine\n'
-    echo '           chroot'
+    printf '           chroot\n'
-    echo '-r <dir>   The chroot dir to use'
+    printf ' -r <dir>   The chroot dir to use\n'
-    echo '-I <pkg>   Install a package into the working copy of the chroot'
+    printf ' -I <pkg>   Install a package into the working copy of the chroot\n'
-    echo '-l <copy>  The directory to use as the working copy of the chroot'
+    printf ' -l <copy>  The directory to use as the working copy of the chroot\n'
-    echo '           Useful for maintaining multiple copies'
+    printf '            Useful for maintaining multiple copies\n'
-    echo "           Default: $copy"
+    printf '            Default: %s\n' "$copy"
-    echo '-n         Run namcap on the package'
+    printf ' -n         Run namcap on the package\n'
-    echo '-C         Run checkpkg on the package'
+    printf ' -C         Run checkpkg on the package\n'
-    echo '-N         Disable check() function'
+    printf ' -N         Disable check() function\n'
-    echo '-T         Build in a temporary directory'
+    printf ' -T         Build in a temporary directory\n'
-    echo '-U         Run makepkg as a specified user'
+    printf ' -U         Run makepkg as a specified user\n'
     exit 1
 }
 
@@ -182,7 +182,7 @@ prepare_chroot() {
         "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
     do
         grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
-        echo "$x" >>"$copydir/etc/makepkg.conf"
+        printf "%s\n" "$x" >>"$copydir/etc/makepkg.conf"
     done
 
     cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF
@@ -239,7 +239,7 @@ _chrootbuild() {
 _chrootnamcap() {
     pacman -S --needed --noconfirm namcap
     for pkgfile in /startdir/PKGBUILD /pkgdest/*; do
-        echo "Checking ${pkgfile##*/}"
+        printf "Checking %s\n" "${pkgfile##*/}"
         sudo -u builduser namcap "$pkgfile" 2>&1 | tee "/logdest/${pkgfile##*/}-namcap.log"
     done
 }

bin/pkg/pkg2yaml.in

@@ -146,16 +146,16 @@ write_srcyaml(){
     yaml_write_global
     yaml_write_package
     yaml_write_fileinfo
-    printf '%s' "${Yaml}"
+    printf '%s\n' "${Yaml}"
 }
 
 #}}}
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    printf 'Usage: %s [options]\n' "${0##*/}"
-    echo "    -d            Don't include details"
+    printf '    -d            Do not include details\n'
-    echo '    -h            This help'
+    printf '    -h            This help\n'
-    echo ''
+    printf '\n'
     exit "$1"
 }
 
@@ -167,7 +167,6 @@ while getopts "${opts}" arg; do
     case "${arg}" in
         d) details=false ;;
         h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
 

bin/pkg/tidyarch.in

@@ -0,0 +1,202 @@
+#!/bin/bash
+#
+# Copyright (C) 2018-20 artoo@artixlinux.org
+# Copyright (C) 2018 Artix Linux Developers
+#
+# 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.
+
+m4_include(lib/util-base.sh)
+m4_include(lib/util-pkg.sh)
+m4_include(lib/base/message.sh)
+m4_include(lib/pkg/repo.sh)
+
+git_rm() {
+    local r="$1"
+    if ! "$run_f"; then
+        printf "git rm -r %s\n" "$r"
+        printf "git commit -m 'remove %s'\n" "${r##*/}"
+    else
+        git rm -r  "$r"
+        git commit -m "remove ${r##*/}"
+    fi
+}
+
+compare_ver() {
+    local a="$1" b="$2" tree="$3" func="$4" va vb
+    # shellcheck disable=1090
+    source "$a"/PKGBUILD 2>/dev/null
+    va=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    # shellcheck disable=1090
+    source "$b"/PKGBUILD 2>/dev/null
+    vb=$(get_full_version)
+    unset pkgver epoch pkgrel arch
+    msg2 "a: %s b: %s" "$va" "$vb"
+    local ret
+    ret=$(vercmp "$va" "$vb")
+    msg2 "ret: %s" "$ret"
+    if [ "$ret" -gt 0 ]; then
+        git_rm "$b"
+    elif [ "$ret" -lt 0 ]; then
+        git_rm "$a"
+    else
+        case "$tree" in
+            "${ARCH_TREE[0]}") git_rm "$a" ;;
+            "${ARCH_TREE[1]}") git_rm "$b" ;;
+        esac
+    fi
+}
+
+check_duplicates() {
+    mapfile -t duplicates < <(find "${TREE_DIR_ARCH}" -mindepth 2 -maxdepth 2 -type d -not -path "*.git" -printf '%f\n' | sort | uniq -d)
+
+    for p in "${duplicates[@]}"; do
+        msg "%s" "$p"
+        local av bv a b
+
+        a="${TREE_DIR_ARCH}/${ARCH_TREE[0]}"
+        # shellcheck disable=1090
+        source "$a/$p"/trunk/PKGBUILD 2>/dev/null
+        av=$(get_full_version)
+
+        b="${TREE_DIR_ARCH}/${ARCH_TREE[1]}"
+        # shellcheck disable=1090
+        source "$b/$p"/trunk/PKGBUILD 2>/dev/null
+        bv=$(get_full_version)
+
+        msg2 "a: %s b: %s" "$av" "$bv"
+        ret=$(vercmp "$av" "$bv")
+        msg2 "ret: %s" "$ret"
+
+        if [ "$ret" -gt 0 ]; then
+            cd "$b"
+            msg2 "%s" "${b##*/}"
+            git_rm "$p"
+        elif [ "$ret" -lt 0 ]; then
+            cd "$a"
+            msg2 "%s" "${a##*/}"
+            git_rm "$p"
+        fi
+    done
+}
+# git config core.mergeoptions --no-edit
+check_tree() {
+    for tree in "${ARCH_TREE[@]}"; do
+        cd "${TREE_DIR_ARCH}/$tree" || exit
+
+        mapfile -t pkgs < <(find . -mindepth 2 -maxdepth 2 -type d -name repos | sort)
+
+        for p in "${pkgs[@]}"; do
+
+            mapfile -t repos < <(find "$p" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | sort)
+
+            local repos_dir=$p
+            p=${p%/*}
+            p=${p##*/}
+            local size=${#repos[@]}
+
+            if (( "$size" > 1 )); then
+                if [[ "${repos[1]}" != "${valid_names[11]}"-* ]] || [[ "${repos[1]}" != "${valid_names[12]}"-* ]]; then
+
+                    local a="$repos_dir/${repos[0]}" b="$repos_dir/${repos[1]}"
+
+                    # repo mismatches
+                    if [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[0]}"-* ]] && [[ "${repos[1]}" == "${valid_names[1]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-* ]] && [[ "${repos[1]}" == "${valid_names[0]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[7]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[3]}"-* ]] && [[ "${repos[1]}" == "${valid_names[4]}"-* ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+
+                    # same repo name but different arch
+                    if [[ "${repos[0]}" == "${valid_names[0]}"-any ]] && [[ "${repos[1]}" == "${valid_names[0]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[1]}"-any ]] && [[ "${repos[1]}" == "${valid_names[1]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+
+                    elif [[ "${repos[0]}" == "${valid_names[2]}"-any ]] && [[ "${repos[1]}" == "${valid_names[2]}"-"$CARCH" ]]; then
+                        msg "%s: %s" "$p" "${repos[*]}"
+                        msg2 "%s" "$tree"
+                        compare_ver "$a" "$b" "$tree"
+                    fi
+                fi
+            fi
+        done
+    done
+}
+
+usage() {
+    printf 'Usage: %s\n' "${0##*/}"
+    printf '    -f                 Apply filter\n'
+    printf '    -r                 Run removal\n'
+    printf '    -d                 Check for duplicates\n'
+    printf '    -h                 This help\n'
+    printf '\n'
+    printf '\n'
+    exit "$1"
+}
+
+load_makepkg_config
+
+load_valid_names
+
+filter=false
+dupl=false
+run_f=false
+
+opts='hrfd'
+
+while getopts ${opts} arg; do
+    case "${arg}" in
+        f) filter=true ;;
+        r) run_f=true ;;
+        d) dupl=true ;;
+        h|?) usage 0 ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+"$filter" && check_tree
+
+"$dupl" && check_duplicates

lib/base/yaml.sh

@@ -3,11 +3,11 @@
 #{{{ yaml
 
 write_yaml_header(){
-    printf '%s' '---'
+    printf '%s\n' '---'
 }
 
 write_empty_line(){
-    printf '\n%s\n' ' '
+    printf '\n'
 }
 
 write_yaml_map(){

lib/iso/calamares.sh

@@ -13,7 +13,7 @@ write_services_conf(){
         yaml+=$(write_yaml_seq 2 "$svc")
     done
     yaml+=$(write_empty_line)
-    printf '%s' "${yaml}"
+    printf '%s\n' "${yaml}"
 }
 
 write_services_openrc_conf(){
@@ -29,6 +29,7 @@ write_services_runit_conf(){
 write_services_s6_conf(){
     local conf="$1"/services-s6.conf
     write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
+    printf '%s\n' "defaultBundle: default" >> "$conf"
 }
 
 write_services_suite66_conf(){

lib/iso/iso.sh

@@ -5,13 +5,13 @@
 get_disturl(){
     # shellcheck disable=1091
     . /usr/lib/os-release
-    echo "${HOME_URL}"
+    printf "%s\n" "${HOME_URL}"
 }
 
 get_osname(){
     # shellcheck disable=1091
     . /usr/lib/os-release
-    echo "${NAME}"
+    printf "%s\n" "${NAME}"
 }
 
 assemble_iso(){

lib/pkg/common.sh

@@ -7,7 +7,7 @@ get_compliant_name(){
     case "$gitname" in
         *+) gitname=${gitname//+/plus}
     esac
-    echo "$gitname"
+    printf "%s\n" "$gitname"
 }
 
 get_pkg_org(){
@@ -18,7 +18,7 @@ get_pkg_org(){
         python-*|python2-*) org="packagesPython" ;;
         *) sub=${pkg:0:1}; org="packages${sub^^}" ;;
     esac
-    echo "$org"
+    printf "%s\n" "$org"
 }
 
 api_put() {

lib/pkg/deploy.sh

@@ -31,7 +31,7 @@ get_pkgbasename() {
     rm_pkg=${rm_pkg%-*}
     rm_pkg=${rm_pkg%-*}
     rm_pkg=${rm_pkg%-*}
-    echo "$rm_pkg"
+    printf "%s\n" "$rm_pkg"
 }
 
 #}}}

lib/pkg/git.sh

@@ -22,12 +22,9 @@ has_changeset(){
 }
 
 pull_tree(){
-    local tree="$1" local_head="$2" os="${3:-Artix}"
+    local tree="$1" lh="$2" rh
-    local remote_head
+    rh=$(get_remote_head)
-    remote_head=$(get_remote_head)
+    if has_changeset "${lh}" "${rh}";then
-
-    msg "Checking (%s) (%s)" "${tree}" "$os"
-    if has_changeset "${local_head}" "${remote_head}";then
         git pull origin master
     fi
 }

lib/pkg/jenkins.sh

@@ -6,11 +6,11 @@ write_jenkinsfile(){
     local pkg="$1"
     local jenkins=$pkg/Jenkinsfile
 
-    echo "@Library('artix-ci') import org.artixlinux.RepoPackage" > "$jenkins"
+    printf "@Library('artix-ci') import org.artixlinux.RepoPackage\n" > "$jenkins"
     {
-    echo ''
+    printf '\n'
-    echo 'PackagePipeline(new RepoPackage(this))'
+    printf 'PackagePipeline(new RepoPackage(this))\n'
-    echo ''
+    printf '\n'
     } >> "$jenkins"
 
     git add "$jenkins"
@@ -21,11 +21,11 @@ write_agentyaml(){
     local agent="$pkg"/.artixlinux/agent.yaml label='master'
     [[ -d $pkg/.artixlinux ]] || mkdir "$pkg"/.artixlinux
 
-    echo '---' > "$agent"
+    printf '---\n' > "$agent"
     {
-    echo ''
+    printf '\n'
-    echo "label: $label"
+    printf "label: %s\n" "$label"
-    echo ''
+    printf '\n'
     } >> "$agent"
 
     git add "$agent"
@@ -37,7 +37,7 @@ commit_jenkins_files(){
     write_jenkinsfile "$pkg"
     write_agentyaml "$pkg"
 
-    git commit -m "initial commit"
+    git commit -m "initial ci commit"
 }
 
 #}}}

lib/pkg/repo.sh

@@ -29,20 +29,20 @@ find_repo(){
         [[ -f $pkg/repos/$r-any/PKGBUILD ]] && repo=repos/"$r"-any
         [[ -f $pkg/$pkgarch/$r/PKGBUILD ]] && repo="$pkgarch/$r"
     done
-    echo "$repo"
+    printf "%s\n" "$repo"
 }
 
 find_pkg(){
     local searchdir="$1" pkg="$2" result
     result=$(find "$searchdir" -mindepth 2 -maxdepth 2 -type d -name "$pkg")
-    echo "$result"
+    printf "%s\n" "$result"
 }
 
 tree_loop(){
     local func="$1" pkgs
     for tree in "${ARTIX_TREE[@]}"; do
-        pkgs=$(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
+        mapfile -t pkgs < <(find "${TREE_DIR_ARTIX}/$tree" -name "$CARCH" | sort)
-        for _package in ${pkgs}; do
+        for _package in "${pkgs[@]}"; do
             "$func" "$_package"
         done
     done