Merge pull request #19 from CubeCoders/wine

feat(wine): refine dep resolution

Author: Greelan

scripts/wine/create-common-deps-list.sh

@@ -1,55 +1,47 @@
 #!/bin/sh
 
-set -eux
+set -eu
+
+if [ "$#" -lt 1 ]; then
+  echo "Usage: $0 <file1> [file2 ...]" >&2
+  exit 2
+fi
 
 TMPDIR="$(mktemp -d)"
-trap 'rm -rf "${TMPDIR}"' EXIT INT TERM
+trap 'rm -rf "$TMPDIR"' EXIT INT TERM
 
-# Normalize: strip CR, trim, drop blanks, unique
 norm() {
-    # shellcheck disable=SC2002
-    cat "$1" \
-    | sed 's/\r$//' \
-    | sed -e 's/^[[:space:]]\+//' -e 's/[[:space:]]\+$//' \
-    | awk 'NF' \
-    | sort -u
+  # $1 -> normalized unique list on stdout
+  sed 's/\r$//' "$1" \
+  | sed -e 's/^[[:space:]]\+//' -e 's/[[:space:]]\+$//' \
+  | awk 'NF' \
+  | sort -u
 }
 
+# Normalize each input
 i=0
 for f in "$@"; do
-    i=$((i+1))
-    norm "${f}" >"${TMPDIR}/f${i}.norm"
+  i=$((i+1))
+  norm "$f" >"${TMPDIR}/f${i}.norm"
 done
 
-# Intersect all normalized files (empty if any input empty)
-intersect() {
-    set -- "$@"
-    nonempty=
-    for g in "$@"; do
-        [ -s "${g}" ] && nonempty="${nonempty} ${g}"
-    done
-    [ -n "${nonempty}" ] || { :; return 0; }
-
-    # shellcheck disable=SC2086
-    set -- ${nonempty}
-    cp "$1" "${TMPDIR}/common"
-    shift
-    while [ "$#" -gt 0 ]; do
-        grep -Fxf "$1" "${TMPDIR}/common" >"${TMPDIR}/next" || true
-        mv "${TMPDIR}/next" "${TMPDIR}/common"
-        shift
-    done
-    cat "${TMPDIR}/common"
-}
-
-# Build the list of normalized files
-FILES=$(seq 1 "$i" | sed "s#^#${TMPDIR}/f#g; s/\$/\.norm/")
+# Intersect all non-empty normalized files
+# If any file is empty, intersection is empty.
+nonempty=""
+for g in "${TMPDIR}"/f*.norm; do
+  [ -s "$g" ] || { : > "${TMPDIR}/common"; echo -n ""; cat "${TMPDIR}/common"; exit 0; }
+  nonempty="${nonempty} ${g}"
+done
 
-# shellcheck disable=SC2086
-COMMON="$(intersect ${FILES} || true)"
+# Seed with the first, then narrow with grep -Fxf
+set -- ${nonempty}
+cp "$1" "${TMPDIR}/common"
+shift
+while [ "$#" -gt 0 ]; do
+  # grep -Fxf returns 1 if no matches; we still want an empty file
+  grep -Fxf "$1" "${TMPDIR}/common" > "${TMPDIR}/next" || true
+  mv "${TMPDIR}/next" "${TMPDIR}/common"
+  shift
+done
 
-# Print in the order of the first file’s normalized list
-if [ -n "${COMMON}" ]; then
-    printf '%s\n' "${COMMON}" >"${TMPDIR}/common.set"
-    awk 'NR==FNR { keep[$0]=1; next } keep[$0]' "${TMPDIR}/common.set" "${TMPDIR}/f1.norm"
-fi
+cat "${TMPDIR}/common"

scripts/wine/find-deps.sh

@@ -1,191 +1,56 @@
 #!/bin/sh
 
-set -eux
+set -eu
 
 BUILD="${1:-stable}"
 WINE_DIST="${WINE_DIST:-bookworm}"
-WINE_FILES_DIR="${WINE_FILES_DIR:-/tmp/wine-files}"
-WINE_LINK="https://dl.winehq.org/wine-builds/debian/pool/main/w/wine$( [ "${BUILD}" = staging ] && printf -- '-staging' || true)/"
 
-case "${BUILD}" in
-    stable|devel|staging)
-        WINE_BRANCH="${BUILD}"
-        MAJOR=""
-        ;;
-    *-stable)
-        WINE_BRANCH="stable"
-        MAJOR="${BUILD%%-*}"
-        ;;
-    *)
-        echo "Unknown build: ${BUILD}" >&2
-        exit 1
-        ;;
-esac
-
-latest_version() {
-    branch="$1"
-    major="${2:-}"
-
-    # List matching debs, extract version, optional major filter, pick latest
-    curl -fsSL "${WINE_LINK}" \
-    | grep -oE "wine-${branch}-amd64_[0-9][0-9.]*~${WINE_DIST}(-[0-9]+)?_amd64\.deb" \
-    | sed -E "s/^wine-${branch}-amd64_([0-9.]+)~${WINE_DIST}(-[0-9]+)?_amd64\.deb$/\1/" \
-    | { [ -n "${major}" ] && awk -F. -v m="${major}" '$1==m' || cat; } \
-    | sort -V \
-    | tail -1
+# Helper: print Inst package names (sans wine metas), sorted unique
+_print_inst() {
+  awk '
+    $1=="Inst" {
+      pkg=$2; sub(/\).*$/,"",pkg)   # trim trailing ")..."
+      # Drop wine meta/self packages
+      if (pkg ~ /^(wine(|32|64)|winehq|wine-(devel|staging|stable))(:|$)/) next
+      gsub(/[[:space:]]+/,"",pkg)
+      print pkg
+    }
+  ' | sort -u
 }
 
-WINE_VERSION="$(latest_version "${WINE_BRANCH}" "${MAJOR}")"
-
-# Helper: select the actual file name (keeps the real -<rev>)
-pick_file() {
-    patt="$1"
-    curl -fsSL "${WINE_LINK}" \
-    | grep -oE "${patt}" \
-    | sort -V \
-    | tail -1
-}
-
-DEB_A1="$(pick_file "wine-${WINE_BRANCH}-amd64_${WINE_VERSION}~${WINE_DIST}(-[0-9]+)?_amd64\.deb")"
-DEB_A2="$(pick_file "wine-${WINE_BRANCH}_${WINE_VERSION}~${WINE_DIST}(-[0-9]+)?_amd64\.deb")"
-DEB_A3="$(pick_file "winehq-${WINE_BRANCH}_${WINE_VERSION}~${WINE_DIST}(-[0-9]+)?_amd64\.deb")"
-DEB_B1="$(pick_file "wine-${WINE_BRANCH}-i386_${WINE_VERSION}~${WINE_DIST}(-[0-9]+)?_i386\.deb")"
-
-mkdir -p "${WINE_FILES_DIR}"
-
-wget -q -P "${WINE_FILES_DIR}" -- "${WINE_LINK}${DEB_A1}"
-wget -q -P "${WINE_FILES_DIR}" -- "${WINE_LINK}${DEB_A2}"
-wget -q -P "${WINE_FILES_DIR}" -- "${WINE_LINK}${DEB_A3}"
-wget -q -P "${WINE_FILES_DIR}" -- "${WINE_LINK}${DEB_B1}"
-
-: >/tmp/wine-reqs.amd64
-: >/tmp/wine-reqs.i386
-
-# Collect dependencies (64-bit)
-for deb in "${WINE_FILES_DIR}"/"${DEB_A1}" "${WINE_FILES_DIR}"/"${DEB_A2}" "${WINE_FILES_DIR}"/"${DEB_A3}"; do
-    {
-        dpkg-deb -I "${deb}" \
-        | awk -F': ' '/^( Depends| Recommends):/{print $2}' \
-        | tr ',' '\n' \
-        | sed -E 's/\(.*\)//; s/^[[:space:]]+|[[:space:]]+$//g' \
-        | grep -E '.' \
-        | grep -Ev '^(wine|winehq)[[:alnum:]-]*$'
-    } >> /tmp/wine-reqs.amd64 || :
-done
-
-# Collect dependencies (32-bit)
-{
-    dpkg-deb -I "${WINE_FILES_DIR}"/"${DEB_B1}" \
-    | awk -F': ' '/^( Depends| Recommends):/{print $2}' \
-    | tr ',' '\n' \
-    | sed -E 's/\(.*\)//; s/^[[:space:]]+|[[:space:]]+$//g' \
-    | grep -E '.' \
-    | grep -Ev '^(wine|winehq)[[:alnum:]-]*$'
-} >> /tmp/wine-reqs.i386 || :
-
-NATIVE="$(dpkg --print-architecture 2>/dev/null)"
-case "${NATIVE}" in
-    amd64) COMPAT="i386";;
-    arm64) COMPAT="armhf";;
+case "${BUILD}" in
+  stable|devel|staging)
+    apt-get -s install -y -o APT::Install-Recommends=1 "winehq-${BUILD}" \
+    | _print_inst
+    ;;
+
+  *-stable)
+    WINE_BRANCH="stable"
+    MAJOR="${BUILD%%-*}"
+
+    WINE_LINK="${WINE_LINK:-https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/}"
+    WINE_BUILD="$(
+      curl -fsSL "${WINE_LINK}" \
+      | grep -oE "wine-${WINE_BRANCH}-amd64_[0-9][0-9.]*~${WINE_DIST}(-[0-9]+)?_amd64\.deb" \
+      | sed -E "s/^wine-${WINE_BRANCH}-amd64_([0-9.]+~${WINE_DIST}(-[0-9]+)?)_amd64\.deb$/\1/" \
+      | awk -F. -v m="${MAJOR}" '$1==m' \
+      | sort -V | tail -1
+    )"
+    if [ -z "${WINE_BUILD}" ]; then
+      echo "Failed to resolve WINE_BUILD for ${BUILD} (dist=${WINE_DIST})." >&2
+      exit 2
+    fi
+
+    apt-get -s install -y -o APT::Install-Recommends=1 \
+      "wine-${WINE_BRANCH}-i386=${WINE_BUILD}" \
+      "wine-${WINE_BRANCH}-amd64=${WINE_BUILD}" \
+      "wine-${WINE_BRANCH}=${WINE_BUILD}" \
+      "winehq-${WINE_BRANCH}=${WINE_BUILD}" \
+    | _print_inst
+    ;;
+
+  *)
+    echo "Unknown build: ${BUILD}" >&2
+    exit 1
+    ;;
 esac
-
-dedup() {
-    awk '!seen[$0]++ && NF'
-}
-
-# Build token set (explode alts, strip versions/quals)
-TOKENS="$(mktemp)"
-cat /tmp/wine-reqs.amd64 /tmp/wine-reqs.i386 \
-| awk 'BEGIN{RS="|"}{gsub(/^[ \t]+|[ \t]+$/,""); if(length)print}' \
-| sed -E 's/\(.*\)//; s/:any$//; s/:all$//; s/^[[:space:]]+|[[:space:]]+$//g' \
-| awk -F: '{print $1}' | dedup >"${TOKENS}"
-
-# Availability caches (store base names for both arches)
-AVN="$(mktemp)"; : >"${AVN}"
-AVC="$(mktemp)"; : >"${AVC}"
-
-# Native availability
-xargs -a "${TOKENS}" -r -I{} printf '%s:%s\n' '{}' "${NATIVE}" \
-| xargs -r apt-cache policy -- 2>/dev/null \
-| awk '
-    /^[^ ]+:$/ {p=$1; sub(/:$/,"",p); next}
-    /^  Candidate: / && $3!="(none)" {
-        base=p; sub(/:.*/,"",base); print base
-    }' | sort -u >"${AVN}"
-
-# Compat availability
-if [ -n "${COMPAT}" ]; then
-    xargs -a "${TOKENS}" -r -I{} printf '%s:%s\n' '{}' "${COMPAT}" \
-    | xargs -r apt-cache policy -- 2>/dev/null \
-    | awk '
-        /^[^ ]+:$/ {p=$1; sub(/:$/,"",p); next}
-        /^  Candidate: / && $3!="(none)" {
-        base=p; sub(/:.*/,"",base); print base
-        }' | sort -u >"${AVC}"
-fi
-
-# Helper: pick first available alternative against given availability cache
-pick_alt() { line=$1; avail=$2; suff=${3:-}; OLDIFS=${IFS}; IFS='|'
-    for t in ${line}; do
-        p=$(printf '%s' "${t}" | sed -E 's/\(.*\)//; s/:any$//; s/:all$//; s/^[[:space:]]+|[[:space:]]+$//g')
-        [ -n "${p}" ] || continue
-        if grep -Fxq "${p}" "${avail}"; then
-        [ -n "${suff}" ] && { printf '%s:%s\n' "${p}" "${suff}"; IFS=${OLDIFS}; return 0; }
-        printf '%s\n' "${p}"; IFS=${OLDIFS}; return 0
-        fi
-    done
-    IFS=${OLDIFS}; return 1
-}
-
-# Helper: return 0 if pkg:arch is Multi-Arch: same, else 1
-ma_same_pkg() { # $1=pkg  $2=arch
-  apt-cache show "$1:$2" 2>/dev/null \
-  | awk -v p="$1" -v a="$2" -F': ' '
-      # parse stanza-by-stanza
-      NF==0 { if (pk && ar==a && tolower(ma)=="same") {ok=1} pk=ar=ma=""; next }
-      $1=="Package"      { pk=$2 }
-      $1=="Architecture" { ar=$2 }
-      $1=="Multi-Arch"   { ma=$2 }
-      END { if (pk && ar==a && tolower(ma)=="same") ok=1; exit (ok?0:1) }
-    '
-}
-
-# Native → print bare names (stable de-dupe)
-NSET="$(mktemp)"; : >"${NSET}"
-while IFS= read -r L; do
-    sel="$(pick_alt "${L}" "${AVN}" || true)"; [ -n "${sel}" ] || continue
-    if ! grep -Fxq "${sel}" "${NSET}"; then printf '%s\n' "${sel}"; printf '%s\n' "${sel}" >>"${NSET}"; fi
-done < /tmp/wine-reqs.amd64
-
-# Compat → pick vs compat cache; avoid native clash unless MA:same; print with :arch
-if [ -n "${COMPAT}" ]; then
-    while IFS= read -r L; do
-        first="$(pick_alt "${L}" "${AVC}" "${COMPAT}" || true)"; [ -n "${first}" ] || continue
-        base="${first%:*}"
-
-        chosen=""
-        if ! grep -Fxq "${base}" "${NSET}"; then
-            chosen="${first}"
-        else
-            if ma_same_pkg "${base}" "${COMPAT}"; then
-                chosen="${first}"
-            else
-                OLDIFS=${IFS}; IFS='|'
-                for t in ${L}; do
-                    p=$(printf '%s' "${t}" | sed -E 's/\(.*\)//; s/:any$//; s/:all$//; s/^[[:space:]]+|[[:space:]]+$//g')
-                    [ -n "${p}" ] || continue
-                    grep -Fxq "${p}" "${AVC}" || continue
-                    if ! grep -Fxq "${p}" "${NSET_SORT}" || ma_same_pkg "${p}" "${COMPAT}"; then
-                        chosen="${p}:${COMPAT}"; break
-                    fi
-                done
-                IFS=${OLDIFS}
-            fi
-        fi
-
-        [ -n "${chosen}" ] && printf '%s\n' "${chosen}"
-    done < /tmp/wine-reqs.i386 | dedup
-fi
-
-# cleanup
-rm -f "${TOKENS}" "${AVN}" "${AVC}" "${NSET}" 2>/dev/null || true

scripts/wine/map-x86-deps-to-arm.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+set -eu
+
+NATIVE="${NATIVE:-arm64}"
+COMPAT="${COMPAT:-armhf}"
+
+# Make sure indexes for both arches exist for availability checks
+dpkg --add-architecture "${COMPAT}" >/dev/null 2>&1 || true
+apt-get -q -o Acquire::Languages=none update >/dev/null
+
+# Helper dedupe
+seen="$(mktemp)"; trap 'rm -f "$seen"' INT TERM EXIT
+emit() {
+  s=$1
+  if ! grep -Fxq "$s" "${seen}" 2>/dev/null; then
+    printf '%s\n' "${s}"
+    printf '%s\n' "${s}" >>"${seen}"
+  fi
+}
+
+has_candidate() {
+  # $1 = token ("pkg" or "pkg:arch"); returns 0 if APT has a candidate
+  cand=$(
+    apt-cache policy "$1" 2>/dev/null \
+      | sed -n 's/^[[:space:]]\{1,\}Candidate: //p' | head -1
+  )
+  [ -n "${cand:-}" ] && [ "${cand}" != "(none)" ]
+}
+
+# Read each line as a token "pkg[:arch]"
+while IFS= read -r tok; do
+  # trim whitespace and CR
+  tok=${tok%$'\r'}
+  tok=$(printf '%s' "${tok}" | sed 's/^[[:space:]]\+//; s/[[:space:]]\+$//')
+  [ -z "${tok}" ] && continue
+  case "${tok}" in \#*) continue ;; esac
+
+  pkg=${tok%%:*}
+  if [ "${pkg}" = "${tok}" ]; then
+    suf=""
+  else
+    suf=${tok#*:}
+  fi
+
+  # no suffix/amd64 => arm64 ; i386 => armhf ; other arches => skip
+  case "${suf}" in
+    ""|"amd64") tgt="${NATIVE}" ;;
+    "i386")     tgt="${COMPAT}" ;;
+    *)          continue      ;;
+  esac
+
+  if has_candidate "${pkg}:${tgt}"; then
+    emit "${pkg}:${tgt}"
+  elif has_candidate "${pkg}"; then          # covers Architecture: all
+    emit "${pkg}"
+  fi
+done