ci: try fix ext

.github/workflows/lint.yaml

@@ -0,0 +1,28 @@
+name: Artools shellcheck
+run-name: ${{ gitea.actor }}
+on:
+  push:
+    branches:
+      - ci
+    tags:
+      - 0.*
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@main
+      - name: Run ShellCheck shell-linter
+        uses: azohra/shell-linter@latest
+        with:
+          path: "src/base/*.in,src/pkg/*.in,src/iso/*.in"
+          severity: "error"
+      - name: Run ShellCheck action-shellcheck
+        uses: ludeeus/action-shellcheck@master
+        env:
+          SHELLCHECK_OPTS: -x -s bash
+        with:
+          additional_files: "src/base/*.in*"
+          #scandir: 'src/base'
+

Makefile

@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 
-V=0.31
+V=0.32
 BUILDTOOLVER ?= $(V)
 
 CHROOTVER=0.12

config/makepkg/x86_64.conf

@@ -44,7 +44,8 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
+         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
 RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems

src/lib/pkg/git/config.sh

@@ -43,7 +43,8 @@ artixpkg_git_config_usage() {
 
     EXAMPLES
         $ ${COMMAND} --maintainer libfoo
-        $ ${COMMAND} --agent galaxy libfoo
+        $ ${COMMAND} --agent=galaxy libfoo
+        $ ${COMMAND} -a galaxy libfoo
         $ ${COMMAND} --drop libfoo
         $ ${COMMAND} *
 _EOF_

src/lib/pkg/repo.sh

@@ -11,39 +11,23 @@ source "${LIBDIR}"/pkg/db/db.sh
 set -e
 
 
-check_pkgbuild_validity() {
+show_agent() {
-    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+    local agent="orion"
-    . ./PKGBUILD
+    msg "Checking agent ..."
-
+    if grep @galaxy "${REPO_CI}" &>/dev/null; then
-    # skip when there are no sources available
+        agent="taurus"
-    if (( ! ${#source[@]} )); then
-        return
-    fi
-
-    # validate sources hash algo is at least > sha1
-    local bad_algos=("cksums" "md5sums" "sha1sums")
-    local good_hash_algo=false
-
-    # from makepkg libmakepkg/util/schema.sh
-    for integ in "${known_hash_algos[@]}"; do
-        local sumname="${integ}sums"
-        if [[ -n ${!sumname} ]] && ! in_array "${sumname}" "${bad_algos[@]}"; then
-            good_hash_algo=true
-            break
-        fi
-    done
-
-    if ! $good_hash_algo; then
-        die "PKGBUILD lacks a secure cryptographic checksum, insecure algorithms: ${bad_algos[*]}"
     fi
+    msg2 "agent: %s" "$agent"
 }
 
-has_changeset(){
+has_remote_changes() {
+    local status
+    msg "Checking for remote changes ..."
     git fetch origin &>/dev/null
-
+    status=$(git status -sb --porcelain)
-    if [[ $(git rev-parse HEAD) != $(git rev-parse @{u}) ]]; then
+    if [[ "$status" == *behind* ]]; then
         msg2 "changes: yes"
-        git status -sb
+        error "Remote changes detected! Please pull (%s)" "${pkgbase}"
         return 0
     fi
     msg2 "changes: no"

src/lib/pkg/repo/add.sh

@@ -8,6 +8,30 @@ ARTOOLS_INCLUDE_REPO_ADD_SH=1
 set -e
 
 
+check_pkgbuild_validity() {
+    # skip when there are no sources available
+    if (( ! ${#source[@]} )); then
+        return
+    fi
+
+    # validate sources hash algo is at least > sha1
+    local bad_algos=("cksums" "md5sums" "sha1sums")
+    local good_hash_algo=false
+
+    # from makepkg libmakepkg/util/schema.sh
+    for integ in "${known_hash_algos[@]}"; do
+        local sumname="${integ}sums"
+        if [[ -n ${!sumname} ]] && ! in_array "${sumname}" "${bad_algos[@]}"; then
+            good_hash_algo=true
+            break
+        fi
+    done
+
+    if ! $good_hash_algo; then
+        die "PKGBUILD lacks a secure cryptographic checksum, insecure algorithms: ${bad_algos[*]}"
+    fi
+}
+
 artixpkg_repo_add_usage() {
     local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
@@ -86,49 +110,57 @@ artixpkg_repo_add() {
             fi
             ( cd "${pkgbase}" || return
 
-                if [[ ! -f PKGBUILD ]]; then
+                if ! has_remote_changes; then
-                    die "No PKGBUILD found in (%s)" "${pkgbase}"
-                fi
 
-                # shellcheck source=contrib/makepkg/PKGBUILD.proto
+                    if [[ ! -f PKGBUILD ]]; then
-                source PKGBUILD
+                        die "No PKGBUILD found in (%s)" "${pkgbase}"
-
-                update_yaml_base
-                update_yaml_add "${REBUILD}" "${ADD}" "${NOCHECK}" "${DEST}"
-
-                local commit_msg
-                commit_msg=$(get_commit_msg 'add' "${DEST}")
-
-                if [[ -f .SRCINFO ]]; then
-                    rm .SRCINFO
-                fi
-
-                if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
-
-                    stat_busy 'Staging files'
-                    for f in $(git ls-files --others); do
-                        git add "$f"
-                    done
-                    for f in $(git ls-files --modified); do
-                        git add "$f"
-                    done
-                    for f in $(git ls-files --deleted); do
-                        git rm "$f"
-                    done
-                    stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
                     fi
 
-                    msg "Querying ${pkgbase} ..."
+                    # shellcheck source=contrib/makepkg/PKGBUILD.proto
-                    if ! show_db; then
+                    source PKGBUILD
-                        warning "Could not query ${REPO_DB}"
+
+                    check_pkgbuild_validity
+
+                    manage-pkgbuild-keys --export
+
+                    update_yaml_base
+                    update_yaml_add "${REBUILD}" "${ADD}" "${NOCHECK}" "${DEST}"
+
+                    local commit_msg
+                    commit_msg=$(get_commit_msg 'add' "${DEST}")
+
+                    if [[ -f .SRCINFO ]]; then
+                        rm .SRCINFO
                     fi
+
+                    if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                        stat_busy 'Staging files'
+                        for f in $(git ls-files --others); do
+                            git add "$f"
+                        done
+                        for f in $(git ls-files --modified); do
+                            git add "$f"
+                        done
+                        for f in $(git ls-files --deleted); do
+                            git rm "$f"
+                        done
+                        stat_done
+
+                        msg 'Commit'
+                        git commit -m "${commit_msg}"
+
+                        if (( PUSH )); then
+                            msg "Push (${pkgbase})"
+                            git push origin master
+                        fi
+
+                        msg "Querying ${pkgbase} ..."
+                        if ! show_db; then
+                            warning "Could not query ${REPO_DB}"
+                        fi
+                    fi
+
                 fi
             )
         fi

src/lib/pkg/repo/import.sh

@@ -26,7 +26,6 @@ patch_pkgbase(){
     git --no-pager diff PKGBUILD
 }
 
-
 artixpkg_repo_import_usage() {
     local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
@@ -125,29 +124,27 @@ artixpkg_repo_import() {
                     version="${TAG}"
                 fi
 
-                msg "Checking origin for changes"
+                if ! has_remote_changes; then
-                if has_changeset; then
+                    show_agent
-                    error "Remote changes detected! Please update (%s)" "${pkgbase}"
+                    msg "Querying ${pkgbase} ..."
+                    if ! show_db; then
+                        warning "Could not query ${REPO_DB}"
+                    fi
+
+                    git checkout "${version}" -b "${version}" &>/dev/null
+                    local temp
+                    temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX")
+
+                    rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null
+                    git checkout master &>/dev/null
+                    git branch -D "${version}" &>/dev/null
+
+                    msg "Importing upstream changeset for ${version}"
+                    rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ #&>/dev/null
+
+                    msg2 "Patching ${pkgbase} ..."
+                    patch_pkgbase "${pkgbase}"
                 fi
-
-                msg "Querying ${pkgbase} ..."
-                if ! show_db; then
-                    warning "Could not query ${REPO_DB}"
-                fi
-
-                git checkout "${version}" -b "${version}" &>/dev/null
-                local temp
-                temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX")
-
-                rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null
-                git checkout master &>/dev/null
-                git branch -D "${version}" &>/dev/null
-
-                msg "Importing upstream changeset for ${version}"
-                rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ #&>/dev/null
-
-                msg2 "Patching ${pkgbase} ..."
-                patch_pkgbase "${pkgbase}"
             )
         fi
 

src/lib/pkg/repo/move.sh

@@ -80,65 +80,69 @@ artixpkg_repo_move() {
             fi
             ( cd "${pkgbase}" || return
 
-                if [[ ! -f PKGBUILD ]]; then
+                if ! has_remote_changes; then
-                    die "No PKGBUILD found in (%s)" "${pkgbase}"
-                fi
-
-                local commit_msg src_version dest_version
-                commit_msg=$(get_commit_msg 'move' "${DEST}" "${SRC}")
-
-                src_version=$(version_from_yaml "${SRC}")
-                dest_version=$(version_from_yaml "${DEST}")
-
-                if [[ "$src_version" != null ]]; then
-
-                    local ret
-                    ret=$(vercmp "$src_version" "$dest_version")
-
-                    if (( ret > 0 )); then
-
-                        update_yaml_move "${SRC}" "${DEST}"
-
-                        if [[ -f .SRCINFO ]]; then
-                            rm .SRCINFO
-                        fi
-
-                        if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
-
-                            stat_busy 'Staging files'
-                            for f in $(git ls-files --modified); do
-                                if [[ "$f" == "${REPO_DB}" ]]; then
-                                    git add "$f"
-                                fi
-                            done
-                            stat_done
-
-                            msg 'Commit'
-                            git commit -m "${commit_msg}"
-
-                            if (( PUSH )); then
-                                msg "Push (${pkgbase})"
-                                git push origin master
-                            fi
-
-                            msg "Querying ${pkgbase} ..."
-                            if ! show_db; then
-                                warning "Could not query ${REPO_DB}"
-                            fi
-
-                        fi
-
-                    elif (( ret < 0 )); then
-
-                        error "invalid move: version $src_version < $dest_version!"
-
-                    else
-                        error "invalid move: version $src_version = $dest_version!"
 
+                    if [[ ! -f PKGBUILD ]]; then
+                        die "No PKGBUILD found in (%s)" "${pkgbase}"
+                    fi
+
+                    local commit_msg src_version dest_version
+                    commit_msg=$(get_commit_msg 'move' "${DEST}" "${SRC}")
+
+                    src_version=$(version_from_yaml "${SRC}")
+                    dest_version=$(version_from_yaml "${DEST}")
+
+                    if [[ "$src_version" != null ]]; then
+
+                        local ret
+                        ret=$(vercmp "$src_version" "$dest_version")
+
+                        if (( ret > 0 )); then
+
+                            update_yaml_move "${SRC}" "${DEST}"
+
+                            if [[ -f .SRCINFO ]]; then
+                                rm .SRCINFO
+                            fi
+
+                            if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                                stat_busy 'Staging files'
+                                for f in $(git ls-files --modified); do
+                                    if [[ "$f" == "${REPO_DB}" ]]; then
+                                        git add "$f"
+                                    fi
+                                done
+                                stat_done
+
+                                msg 'Commit'
+                                git commit -m "${commit_msg}"
+
+                                if (( PUSH )); then
+                                    msg "Push (${pkgbase})"
+                                    git push origin master
+                                fi
+
+                                msg "Querying ${pkgbase} ..."
+                                if ! show_db; then
+                                    warning "Could not query ${REPO_DB}"
+                                fi
+
+                            fi
+
+                        elif (( ret < 0 )); then
+
+                            error "${pkgbase}: invalid move: version $src_version < $dest_version!"
+
+                        else
+                            error "${pkgbase}: invalid move: version $src_version = $dest_version!"
+
+                        fi
+
+                    else
+                        error "${pkgbase}: invalid move: version $src_version!"
                     fi
 
-                else
-                    error "invalid move: version $src_version!"
                 fi
 
             )

src/lib/pkg/repo/remove.sh

@@ -73,36 +73,40 @@ artixpkg_repo_remove() {
             fi
             ( cd "${pkgbase}" || return
 
-                if [[ ! -f PKGBUILD ]]; then
+                if ! has_remote_changes; then
-                    die "No PKGBUILD found in (%s)" "${pkgbase}"
-                fi
 
-                local commit_msg
+                    if [[ ! -f PKGBUILD ]]; then
-                commit_msg=$(get_commit_msg 'remove' "${DEST}")
+                        die "No PKGBUILD found in (%s)" "${pkgbase}"
-
-                update_yaml_remove "${DEST}"
-
-                if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
-
-                    stat_busy 'Staging files'
-                    for f in $(git ls-files --modified); do
-                        if [[ "$f" == "${REPO_DB}" ]]; then
-                            git add "$f"
-                        fi
-                    done
-                    stat_done
-
-                    msg 'Commit'
-                    git commit -m "${commit_msg}"
-
-                    if (( PUSH )); then
-                        msg "Push (${pkgbase})"
-                        git push origin master
                     fi
 
-                    msg "Querying ${pkgbase} ..."
+                    local commit_msg
-                    if ! show_db; then
+                    commit_msg=$(get_commit_msg 'remove' "${DEST}")
-                        warning "Could not query ${REPO_DB}"
+
+                    update_yaml_remove "${DEST}"
+
+                    if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
+
+                        stat_busy 'Staging files'
+                        for f in $(git ls-files --modified); do
+                            if [[ "$f" == "${REPO_DB}" ]]; then
+                                git add "$f"
+                            fi
+                        done
+                        stat_done
+
+                        msg 'Commit'
+                        git commit -m "${commit_msg}"
+
+                        if (( PUSH )); then
+                            msg "Push (${pkgbase})"
+                            git push origin master
+                        fi
+
+                        msg "Querying ${pkgbase} ..."
+                        if ! show_db; then
+                            warning "Could not query ${REPO_DB}"
+                        fi
+
                     fi
 
                 fi

src/lib/pkg/repo/show.sh

@@ -72,28 +72,27 @@ artixpkg_repo_show() {
             fi
             ( cd "${pkgbase}" || return
 
-                msg "Checking origin for changes"
+                if ! has_remote_changes; then
-                if has_changeset; then
+                    if [[ ! -f PKGBUILD ]]; then
-                    warning "Remote changes detected! Please update (%s)" "${pkgbase}"
+                        die "No PKGBUILD found in (%s)" "${pkgbase}"
-                fi
+                    fi
 
-                if [[ ! -f PKGBUILD ]]; then
+                    show_agent
-                    die "No PKGBUILD found in (%s)" "${pkgbase}"
-                fi
 
-                msg "Querying ${pkgbase} ..."
+                    msg "Querying ${pkgbase} ..."
-                if ! show_db; then
+                    if ! show_db; then
-                    warning "Could not query ${REPO_DB}"
+                        warning "Could not query ${REPO_DB}"
-                fi
+                    fi
 
-                if (( SRC_BASE )); then
+                    if (( SRC_BASE )); then
-                    msg "Showing srcinfo base ..."
+                        msg "Showing srcinfo base ..."
-                    show_srcinfo_base
+                        show_srcinfo_base
-                fi
+                    fi
 
-                if (( SRC_PKGS )); then
+                    if (( SRC_PKGS )); then
-                    msg "Showing srcinfo pkgs ..."
+                        msg "Showing srcinfo pkgs ..."
-                    show_srcinfo_pkgs
+                        show_srcinfo_pkgs
+                    fi
                 fi
 
             )

src/pkg/export-pkgbuild-keys.in

@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-LIBDIR=${LIBDIR:-'@libdir@'}
-
-# shellcheck source=src/lib/base/message.sh
-source "${LIBDIR}"/base/message.sh
-
-usage() {
-    cat <<- _EOF_
-        Usage: ${BASH_SOURCE[0]##*/}
-
-        Export the PGP keys from a PKGBUILDs validpgpkeys array into the keys/pgp/
-        subdirectory. Useful for distributing packager validated source signing
-        keys alongside PKGBUILDs.
-
-        OPTIONS
-            -h, --help      Show this help text
-_EOF_
-}
-
-# option checking
-while (( $# )); do
-    case $1 in
-        -h|--help) usage; exit 0 ;;
-        *) die "invalid argument: %s" "$1" ;;
-    esac
-done
-
-if [[ ! -f PKGBUILD ]]; then
-    die "This must be run a directory containing a PKGBUILD."
-fi
-
-mapfile -t validpgpkeys < <(
-    # shellcheck source=contrib/makepkg/PKGBUILD.proto
-    . ./PKGBUILD
-    if (( ${#validpgpkeys[@]} )); then
-        printf "%s\n" "${validpgpkeys[@]}"
-    fi
-)
-
-msg "Exporting ${#validpgpkeys[@]} PGP keys..."
-if (( ${#validpgpkeys[@]} == 0 )); then
-    exit 0
-fi
-
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
-
-mkdir -p keys/pgp
-error=0
-
-for key in "${validpgpkeys[@]}"; do
-    gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
-
-    # gpg does not give a non-zero return value if it fails to export...
-    if [[ -f $TEMPDIR/$key.asc ]]; then
-        msg2 "Exported $key"
-        mv "$TEMPDIR/$key.asc" "keys/pgp/$key.asc"
-    else
-        if [[ -f keys/pgp/$key.asc ]]; then
-            warning "Failed to update key: $key"
-        else
-            error "Key unavailable: $key"
-            error=1
-        fi
-    fi
-done
-
-if (( error )); then
-    die "Failed to export all \'validpgpkeys\' entries."
-fi

src/pkg/manage-pkgbuild-keys.in

@@ -0,0 +1,97 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+LIBDIR=${LIBDIR:-'@libdir@'}
+
+# shellcheck source=src/lib/base/message.sh
+source "${LIBDIR}"/base/message.sh
+
+
+usage() {
+    cat <<- _EOF_
+        Usage: ${BASH_SOURCE[0]##*/}
+
+        Export or import the PGP keys from a PKGBUILDs validpgpkeys array into/from the keys/pgp/
+        subdirectory. Useful for distributing packager validated source signing
+        keys alongside PKGBUILDs.
+
+        OPTIONS
+            -i, --import    Import keys
+            -e, --export    Export keys
+            -h, --help      Show this help text
+_EOF_
+}
+
+action=
+
+# option checking
+while (( $# )); do
+    case $1 in
+        -i|--import) action="import"; shift ;;
+        -e|--export) action="export"; shift ;;
+        -h|--help) usage; exit 0 ;;
+        *) die "invalid argument: %s" "$1" ;;
+    esac
+done
+
+if [[ ! -f PKGBUILD ]]; then
+    die "This must be run a directory containing a PKGBUILD."
+fi
+
+mapfile -t validpgpkeys < <(
+    # shellcheck source=contrib/makepkg/PKGBUILD.proto
+    . ./PKGBUILD
+    if (( ${#validpgpkeys[@]} )); then
+        printf "%s\n" "${validpgpkeys[@]}"
+    fi
+)
+
+if [[ "$action" == 'export' ]]; then
+    msg "Exporting ${#validpgpkeys[@]} PGP keys..."
+    if (( ${#validpgpkeys[@]} == 0 )); then
+        exit 0
+    fi
+
+    trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+    TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
+
+    mkdir -p keys/pgp
+    error=0
+
+
+    for key in "${validpgpkeys[@]}"; do
+        gpg --output "$TEMPDIR/$key.asc" --armor --export --export-options export-minimal "$key" 2>/dev/null
+
+        # gpg does not give a non-zero return value if it fails to export...
+        if [[ -f $TEMPDIR/$key.asc ]]; then
+            msg2 "Exported $key"
+            mv "$TEMPDIR/$key.asc" "keys/pgp/$key.asc"
+        else
+            if [[ -f keys/pgp/$key.asc ]]; then
+                warning "Failed to update key: $key"
+            else
+                error "Key unavailable: $key"
+                error=1
+            fi
+        fi
+    done
+elif [[ "$action" == 'import' ]]; then
+    msg "Ensuring required PGP keys are present..."
+    for key in "${validpgpkeys[@]}"; do
+        msg2 "Checking for $key..."
+        if ! gpg --recv-keys $key || gpg --fingerprint $key; then
+            if [[ -f keys/pgp/$key.asc ]]; then
+                msg2 "Importing key from local..."
+                gpg --import keys/pgp/$key.asc
+            else
+                error "Key unavailable: $key"
+                error=1
+            fi
+        fi
+    done
+fi
+
+if (( error )); then
+    die "Failed to $action all \'validpgpkeys\' entries."
+fi