Merge branch 'artools/0.34.x' into no-shallow

Reviewed-on: artix/artools#127
Reviewed-by: Cory Sanin <corysanin@artixlinux.org>

config/conf/artools-pkg.conf

@@ -38,3 +38,6 @@
 
 # default jenkins agents
 # AGENTS=(orion taurus)
+
+# whether to include custom maintainer line when importing from arch
+# PATCH_MAINTAINER=yes

contrib/completion/bash/artixpkg.in

@@ -70,7 +70,7 @@ _artixpkg_completion() {
 
     case "${comp_cword_exflag}" in
         1)
-            COMPREPLY=($(compgen -W "admin ci git repo version -h --help" -- "${cur}"))
+            COMPREPLY=($(compgen -W "admin git repo version -h --help" -- "${cur}"))
             return 0
             ;;
         2)
@@ -78,11 +78,8 @@ _artixpkg_completion() {
                 admin)
                     COMPREPLY=($(compgen -W "maintainer query team topic transfer -h --help" -- ${cur}))
                     ;;
-                ci)
-                    COMPREPLY=($(compgen -W "config -h --help" -- ${cur}))
-                    ;;
                 git)
-                    COMPREPLY=($(compgen -W "clone config create pull push -h --help" -- ${cur}))
+                    COMPREPLY=($(compgen -W "ci clone config create pull push -h --help" -- ${cur}))
                     ;;
                 repo)
                     COMPREPLY=($(compgen -W "add remove move import show -h --help" -- ${cur}))
@@ -215,17 +212,13 @@ _artixpkg_completion() {
                             ;;
                     esac
                     ;;
-                "artixpkg ci config"*)
+                "artixpkg git ci"*)
                     case "${prev}" in
-                        "-j"|"--jobs")
-                            # this flag expects a parameter
-                            COMPREPLY=()
-                            ;;
                         "-a"|"--agent")
                             COMPREPLY=($(compgen -W "$agents" -- ${cur}))
                             ;;
                         *)
-                            COMPREPLY=($(compgen -W "-a --agent -s --switch -j --jobs -h --help $(_artixpkg_pkgbase)" -- ${cur}))
+                            COMPREPLY=($(compgen -W "-a --agent -h --help $(_artixpkg_pkgbase)" -- ${cur}))
                             ;;
                     esac
                     ;;

src/lib/pkg/repo/import.sh

@@ -12,7 +12,7 @@ PATCHDIR=${PATCHDIR:-"${WORKSPACE_DIR}/artix-patches"}
 update_patches(){
     if [[ ! -d "${PATCHDIR}" ]]; then
         # ${GIT_ORG}
-        if ! git clone --depth=1 "${GIT_SSH}:artix/artix-patches.git" "${PATCHDIR}"; then
+        if ! git clone "${GIT_SSH}:artix/artix-patches.git" "${PATCHDIR}"; then
             >&2 echo 'failed to clone %s' "${PATCHDIR}"
         fi
     else
@@ -28,13 +28,26 @@ patch_pkgbase(){
     sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
         -e 's|(Arch Linux)|(Artix Linux)|' \
         -e 's|arch-meson|artix-meson|' \
-        -e 's|# Maintainer:|# Contributor:|' \
         -i PKGBUILD
-    if [ -n "${PACKAGER}" ]; then
+
+    if [ "${PATCH_MAINTAINER}" = "yes" ] && [ -n "${PACKAGER}" ]; then
+        sed -e 's|# Maintainer:|# Contributor:|' -i PKGBUILD
         printf '%s\n%s\n' "# Maintainer: ${PACKAGER}" "$(cat "PKGBUILD")" >"PKGBUILD"
     fi
 
     if [ -d "${patches}" ]; then
+        if [ -f "${patches}/env.txt" ]; then
+            while read -r line; do
+                IFS="=" read -r key value <<< "$line"
+                if [[ -z "${key}" ]] || [[ -z "${value}" ]]; then
+                    die "Invalid key value pair in env.txt"
+                fi
+                if declare -p "${key}" &> /dev/null; then
+                    die "Environment variable %s already exists." "${key}"
+                fi
+                export "${key}=${value}"
+            done < "${patches}/env.txt"
+        fi
         for file in "${patches}"/*; do
             if [ -x "${file}" ]; then
                 echo "$> ${name}/$(basename "${file}")"