Merge branch 'offload-build-handle-non-bash' into 'master'

fix(offload-build): Handle non-bash shell on build server

See merge request archlinux/devtools!293

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search

src/archbuild.in

@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 makechrootpkg_args+=("${@:$OPTIND}")
 
 # Automatically recreate the root chroot if a version mismatch is detected
-CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
 if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
 	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
 	clean_first=true

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/license/setup.sh

@@ -191,7 +191,9 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/offload-build.in

@@ -94,12 +94,12 @@ makepkg_source_package || die "unable to make source package"
 rmdir --ignore-fail-on-non-empty src 2>/dev/null || true
 
 # Create a temporary directory on the server
-remote_temp=$(
-    ssh "${SSH_OPTS[@]}" -- "$server" '
-        temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
-        mkdir -p "$temp" &&
-        mktemp --directory --tmpdir="$temp"
-')
+cmd='
+    temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
+    mkdir -p "$temp" &&
+    mktemp --directory --tmpdir="$temp"
+'
+remote_temp=$(ssh "${SSH_OPTS[@]}" -- "$server" "bash -l -c '$cmd'")
 
 # Transfer the srcpkg to the server
 msg "Transferring source package to the server..."
@@ -109,36 +109,34 @@ rsync "${RSYNC_OPTS[@]}" -- "$srcpkg" "$server":"$remote_temp" || die
 
 # Prepare the srcpkg on the server
 msg "Extracting srcpkg"
-ssh "${SSH_OPTS[@]}" -- "$server" "cd ${remote_temp@Q} && bsdtar --strip-components 1 -xvf $(basename "$srcpkg")" || die
+ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l 'cd ${remote_temp@Q} && bsdtar --strip-components 1 -xvf $(basename "$srcpkg")'" || die
 
 # Run the build command on the server
 msg "Running archbuild"
 # shellcheck disable=SC2145
-if ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}"; then
+if ssh "${SSH_OPTS[@]}" -t -- "$server" "bash -c -l 'cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}'"; then
     msg "Build complete"
 
     # Get an array of files that should be downloaded from the server
-    mapfile -t files < <(
-        ssh "${SSH_OPTS[@]}" -- "$server" "
-            cd ${remote_temp@Q}"' &&
-            makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
-            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
-            if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
-                makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
-            fi &&
-            while read -r file; do
-                [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
-            done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
-            printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
+    cmd='
+        cd '"${remote_temp@Q}"' &&
+        makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
+        makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
+        if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
+            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
+        fi &&
+        while read -r file; do
+            [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
+        done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
+        printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
 
-            find '"${remote_temp@Q}"' -name "*.log"
-    ')
+        find '"${remote_temp@Q}"' -name "*.log"
+    '
+    mapfile -t files < <(ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l '$cmd'")
 else
     # Build failed, only the logs should be downloaded from the server
-    mapfile -t files < <(
-        ssh "${SSH_OPTS[@]}" -- "$server" '
-            find '"${remote_temp@Q}"' -name "*.log"
-    ')
+    cmd='find '"${remote_temp@Q}"' -name "*.log"'
+    mapfile -t files < <(ssh "${SSH_OPTS[@]}" -- "$server" "bash -c -l '$cmd'")
 fi