services/nomad/build/build-rsyncd: handle multilib properly

Author: classabbyamp

services/nomad/build/rsync-post-xfer

@@ -11,19 +11,19 @@ process_repo() {
     fi
     # add to repodata
     find "$RSYNC_MODULE_PATH"/"$repo" -maxdepth 1 -type f -printf "$TGT_BASE/$TGT/$repo/%f\0" | \
-        xargs -r0 xbps-rindex -a
+        xargs -r0 env XBPS_TARGET_ARCH="$ARCH" xbps-rindex -a
     # clean old packages from repodata
-    xbps-rindex -c "$TGT_BASE/$TGT/$repo"
+    XBPS_TARGET_ARCH="$ARCH" xbps-rindex -c "$TGT_BASE/$TGT/$repo"
     # remove old packages
-    xbps-rindex -r "$TGT_BASE/$TGT/$repo"
+    XBPS_TARGET_ARCH="$ARCH" xbps-rindex -r "$TGT_BASE/$TGT/$repo"
     # Remove signatures that don't have a corresponding package
     find "$TGT_BASE/$TGT/$repo" -maxdepth 1 \( -name '*.xbps.sig' -o -name '*.xbps.sig2' \) \
         -exec sh -c 'for x in "$@"; do [ -e "${x%.sig*}" ] || rm -- $x; done' _ {} +
 }
 
-export XBPS_TARGET_ARCH="${RSYNC_MODULE_NAME#*-}"
+ARCH="${RSYNC_MODULE_NAME#*-}"
 
-case "$XBPS_TARGET_ARCH" in
+case "$ARCH" in
     aarch64*) TGT="aarch64" ;;
     *-musl) TGT="musl" ;;
     *) TGT="" ;;
@@ -36,11 +36,14 @@ for repo in / /bootstrap /debug /nonfree; do
     process_repo "$repo"
 done
 
-if [ "$XBPS_TARGET_ARCH" = 'i686' ]; then
-    for repo in /multilib /multilib/bootstrap /multilib/nonfree; do
-        process_repo "$repo"
-    done
-fi
+case "$ARCH" in
+    x86_64|i686)
+        ARCH=x86_64
+        for repo in /multilib /multilib/bootstrap /multilib/nonfree; do
+            process_repo "$repo"
+        done
+        ;;
+esac
 
 # clean up incoming
 rm -r "${RSYNC_MODULE_PATH:?}"/*