merge branch 'arch-patches'

bin/pkg/diffpkg.in

@@ -205,7 +205,8 @@ diff_pkgs() {
     [[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
     [[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
 
-    DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
+    local -a diffoptions
+    diffoptions=("${DIFFOPTIONS[@]}" --label "${oldpkg}" --label "${newpkg}")
 
     if (( TARLIST )); then
         tar_list "$oldpkg" > "$TMPDIR/old"
@@ -226,7 +227,7 @@ diff_pkgs() {
     # Resolve dynamic auto width one we know the content to diff
         if [[ $DIFFWIDTH == --width=auto ]]; then
             AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
-            DIFFOPTIONS+=("--width=${AUTOLENGTH}")
+            diffoptions+=("--width=${AUTOLENGTH}")
         fi
 
         # Print a header for side-by-side view as it lacks labels
@@ -234,7 +235,7 @@ diff_pkgs() {
             printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
         fi
 
-        diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
+        diff "${diffoptions[@]}" "$TMPDIR/old" "$TMPDIR/new"
     fi
 
     if (( DIFFOSCOPE )); then

lib/base/message.sh

@@ -22,14 +22,19 @@ stat_busy() {
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
+stat_progress() {
+    # shellcheck disable=2059
+    printf "${BOLD}.${ALL_OFF}" >&2
+}
+
 stat_done() {
     # shellcheck disable=2059
     printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
 lock_close() {
-	local fd=$1
-	exec {fd}>&-
+    local fd=$1
+    exec {fd}>&-
 }
 
 lock() {

lib/pkg/git.sh

@@ -22,8 +22,9 @@ artixpkg_git_usage() {
 
     EXAMPLES
         $ ${COMMAND} clone libfoo linux libbar
-        $ ${COMMAND} clone --maintainer mynickname
-        $ ${COMMAND} config *
+        $ ${COMMAND} clone --maintainer maintainer-mynickname
+        $ ${COMMAND} config -t libfoo
+        $ ${COMMAND} config -u libfoo
         $ ${COMMAND} create libfoo
 _EOF_
 }

lib/pkg/git/clone.sh

@@ -17,6 +17,7 @@ artixpkg_git_clone_usage() {
 
     OPTIONS
         -m, --maintainer=NAME  Clone all packages of the named maintainer
+        --protocol https       Clone the repository over https
         -t, --topic=NAME       Clone all packages of the named topic
         -j, --jobs N           Run up to N jobs in parallel (default: $(nproc))
         --universe             Clone all existing packages, useful for cache warming
@@ -55,11 +56,21 @@ artixpkg_git_clone() {
                 artixpkg_git_clone_usage
                 exit 0
             ;;
-            -u|--unprivileged)
+            --protocol=https)
                 GIT_REPO_BASE_URL="${GIT_URL}/"
                 CONFIGURE_OPTIONS+=("$1")
                 shift
             ;;
+            --protocol)
+                (( $# <= 1 )) && die "missing argument for %s" "$1"
+                if [[ $2 == https ]]; then
+                    GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
+                else
+                    die "unsupported protocol: %s" "$2"
+                fi
+                CONFIGURE_OPTIONS+=("$1" "$2")
+                shift 2
+            ;;
             -m|--maintainer)
                 (( $# <= 1 )) && die "missing argument for %s" "$1"
                 MAINTAINER="$2"

lib/pkg/git/config.sh

@@ -16,7 +16,8 @@ artixpkg_git_config_usage() {
 
     OPTIONS
         -t, --topic        Set the maintainer topic via gitea api
-        -u, --upstream     add upstream arch remote
+        -u, --upstream     Add upstream arch remote
+        --protocol https     Configure remote url to use https
         -j, --jobs N       Run up to N jobs in parallel (default: $(nproc))
         -h, --help         Show this help text
 
@@ -80,6 +81,7 @@ artixpkg_git_config() {
     local GIT_REPO_BASE_URL=${GIT_URL}
     local official=0
     local proto=https
+    local proto_force=0
     local jobs=
     jobs=$(nproc)
     local paths=()
@@ -106,6 +108,19 @@ artixpkg_git_config() {
             UPSTREAM=1
             shift
         ;;
+        --protocol=https)
+            proto_force=1
+            shift
+        ;;
+        --protocol)
+            (( $# <= 1 )) && die "missing argument for %s" "$1"
+            if [[ $2 == https ]]; then
+                proto_force=1
+            else
+                die "unsupported protocol: %s" "$2"
+            fi
+            shift 2
+        ;;
         -j|--jobs)
             (( $# <= 1 )) && die "missing argument for %s" "$1"
             jobs=$2
@@ -149,8 +164,10 @@ artixpkg_git_config() {
         fi
         if is_packager_email_official "${packager_email}"; then
             official=1
-            proto=ssh
-            GIT_REPO_BASE_URL=${GIT_SSH}
+            if (( ! proto_force )); then
+                proto=ssh
+                GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
+            fi
         fi
     fi
 

lib/pkg/git/create.sh

@@ -19,7 +19,7 @@ artixpkg_git_create_usage() {
 
     OPTIONS
         -c, --clone       Clone the Git repository after creation
-        -t, --team=NAME   Clone the Git repository after creation
+        -t, --team=NAME   Assign team name [default: world]
         -h, --help        Show this help text
 
     EXAMPLES

lib/pkg/repo.sh

@@ -8,7 +8,7 @@ ARTOOLS_INCLUDE_REPO_SH=1
 set -e
 
 artixpkg_repo_usage() {
-    local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    local -r COMMAND=${_ARTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
     cat <<- _EOF_
     Usage: ${COMMAND} [COMMAND] [OPTIONS]
 
@@ -22,9 +22,10 @@ artixpkg_repo_usage() {
         -h, --help     Show this help text
 
     EXAMPLES
-        $ ${COMMAND} add libfoo extra
-        $ ${COMMAND} remove libfoo extra
-        $ ${COMMAND} move libfoo extra-testing extra
+        $ ${COMMAND} add extra libfoo
+        $ ${COMMAND} remove extra libfoo
+        $ ${COMMAND} move extra-testing extra libfoo
+        $ ${COMMAND} import libfoo
 _EOF_
 }
 
@@ -43,6 +44,8 @@ ARTIX_DB=(
     multilib-staging
     kde-unstable
     gnome-unstable
+    core-rebuild
+    extra-rebuild
 )
 
 artixpkg_repo() {

lib/pkg/repo/add.sh

@@ -24,7 +24,7 @@ artixpkg_repo_add_usage() {
     EXAMPLES
         $ ${COMMAND} extra-testing libfoo
         $ ${COMMAND} -p extra-testing libfoo
-        $ ${COMMAND} -tp extra-testing libfoo
+        $ ${COMMAND} -t -p extra-testing libfoo
 _EOF_
 }
 
@@ -98,32 +98,40 @@ artixpkg_repo_add() {
 
                 cp -r trunk/* "$CARCH/${DEST}"/
 
-                if [[ "${DEST}" != 'trunk' ]]; then
-                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
-                fi
+                pkgbuild="$CARCH/${DEST}"/PKGBUILD
 
                 # shellcheck disable=1090
                 source "$pkgbuild"
 
                 local commit_msg
                 commit_msg=$(get_commit_msg)
-                msg "Action: %s" "$commit_msg"
 
-                git add .
-                git commit -m "$commit_msg"
+                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
 
-                if (( PUSH )); then
-                    msg "Push (${pkgbase})"
-                    git push origin master
-                fi
+                    msg 'Staging files'
+                    for f in $(git ls-files --modified -o --directory); do
+                        git add "$f"
+                    done
+#                     stat_done
 
-                if (( SET_TOPIC )); then
-                    # topics meta
-                    if [[ -n ${GIT_TOKEN} ]]; then
-                        local topic="${DEST}"
-                        local gitname=$(get_compliant_name "${pkgbase}")
-                        if ! add_topic "${gitname}" "${topic}" >/dev/null; then
-                            warning "failed to add pacman repo topic: ${topic}"
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+#                     stat_done
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+#                         stat_done
+                    fi
+
+                    if (( SET_TOPIC )); then
+                        # topics meta
+                        if [[ -n ${GIT_TOKEN} ]]; then
+                            local topic="${DEST}"
+                            local gitname=$(get_compliant_name "${pkgbase}")
+                            if ! add_topic "${gitname}" "${topic}" >/dev/null; then
+                                warning "failed to add pacman repo topic: ${topic}"
+                            fi
                         fi
                     fi
                 fi

lib/pkg/repo/move.sh

@@ -21,7 +21,7 @@ artixpkg_repo_move_usage() {
     EXAMPLES
         $ ${COMMAND} extra-testing extra libfoo
         $ ${COMMAND} -p extra-testing extra libfoo
-        $ ${COMMAND} -tp extra-testing extra libfoo
+        $ ${COMMAND} -t -p extra-testing extra libfoo
 _EOF_
 }
 
@@ -103,39 +103,50 @@ artixpkg_repo_move() {
                 [[ ! -d "$CARCH" ]] && mkdir "$CARCH"
                 [[ ! -d "$CARCH/${DEST}" ]] && mkdir "$CARCH/${DEST}"
 
-                cp -r "$CARCH/${SRC}"/* "$CARCH/${DEST}"/
-                git rm -r "$CARCH/${SRC}"
+                mv -T "$CARCH/${SRC}" "$CARCH/${DEST}"
+
+                pkgbuild="$CARCH/${DEST}"/PKGBUILD
 
-                if [[ "${SRC}" != 'trunk' ]]; then
-                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
-                fi
                 # shellcheck disable=1090
                 source "$pkgbuild"
 
                 local commit_msg
-
                 commit_msg=$(get_commit_msg)
-                msg "Action: %s" "$commit_msg"
 
-                git add .
-                git commit -m "$commit_msg"
+                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
 
-                if (( PUSH )); then
-                    msg "Push (${pkgbase})"
-                    git push origin master
-                fi
+#                     git add .
+                    msg 'Staging files'
+                    for f in $(git ls-files --deleted); do
+                        git rm "$f"
+                    done
+                    for f in $(git ls-files -o --unmerged); do
+                        git add "$f"
+                    done
+#                     stat_done
 
-                if (( SET_TOPIC )); then
-                    # topics meta
-                    if [[ -n ${GIT_TOKEN} ]]; then
-                        local topic="${DEST}"
-                        local gitname=$(get_compliant_name "${pkgbase}")
-                        if ! add_topic "${gitname}" "${topic}" >/dev/null; then
-                            warning "failed to add pacman repo topic: ${topic}"
-                        fi
-                        topic="${SRC}"
-                        if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
-                            warning "failed to remove pacman repo topic: ${topic}"
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+#                     stat_done
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+#                         stat_done
+                    fi
+
+                    if (( SET_TOPIC )); then
+                        # topics meta
+                        if [[ -n ${GIT_TOKEN} ]]; then
+                            local topic="${DEST}"
+                            local gitname=$(get_compliant_name "${pkgbase}")
+                            if ! add_topic "${gitname}" "${topic}" >/dev/null; then
+                                warning "failed to add pacman repo topic: ${topic}"
+                            fi
+                            topic="${SRC}"
+                            if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
+                                warning "failed to remove pacman repo topic: ${topic}"
+                            fi
                         fi
                     fi
                 fi

lib/pkg/repo/remove.sh

@@ -21,7 +21,7 @@ artixpkg_repo_remove_usage() {
     EXAMPLES
         $ ${COMMAND} extra-testing libfoo
         $ ${COMMAND} -p extra-testing libfoo
-        $ ${COMMAND} -tp extra-testing libfoo
+        $ ${COMMAND} -t -p extra-testing libfoo
 _EOF_
 }
 
@@ -91,35 +91,44 @@ artixpkg_repo_remove() {
                     die "No PKGBUILD found in (%s)" "trunk"
                 fi
 
-                if [[ "${DEST}" != 'trunk' ]]; then
-                    pkgbuild="$CARCH/${DEST}"/PKGBUILD
-                fi
+                pkgbuild="$CARCH/${DEST}"/PKGBUILD
+
                 # shellcheck disable=1090
                 source "$pkgbuild"
 
                 local commit_msg
-
                 commit_msg=$(get_commit_msg)
-                msg "Action: %s" "$commit_msg"
-                if [[ "${DEST}" == 'trunk' ]];then
-                    git rm -r "trunk"
-                else
-                    git rm -r "$CARCH/${DEST}"
-                fi
 
-                if (( PUSH )); then
-                    msg "Push (${pkgbase})"
-                    git push origin master
-                fi
+                rm -r "$CARCH/${DEST}"
 
-                if (( SET_TOPIC )); then
-                    # topics meta
-                    if [[ -n ${GIT_TOKEN} ]]; then
-                        local topic="${SRC}"
-                        if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
-                            warning "failed to remove pacman repo topic: ${topic}"
+                if [[ -n $(git status --porcelain --untracked-files=normal) ]]; then
+
+                    msg 'Staging files'
+                    for f in $(git ls-files --deleted); do
+                        git rm "$f"
+                    done
+#                     stat_done
+
+                    msg 'Commit'
+                    git commit -m "${commit_msg}"
+#                     stat_done
+
+                    if (( PUSH )); then
+                        msg "Push (${pkgbase})"
+                        git push origin master
+#                         stat_done
+                    fi
+
+                    if (( SET_TOPIC )); then
+                        # topics meta
+                        if [[ -n ${GIT_TOKEN} ]]; then
+                            local topic="${SRC}"
+                            if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
+                                warning "failed to remove pacman repo topic: ${topic}"
+                            fi
                         fi
                     fi
+
                 fi
             )
         fi