From 24c47d1e3f8dae6c1b1d3a447c78f53173e09431 Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Sat, 8 Jan 2022 17:18:44 -0800 Subject: [PATCH] Fix build scripts for real --- scripts/fpm-bundle.sh | 7 +++++-- scripts/release.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/fpm-bundle.sh b/scripts/fpm-bundle.sh index f1bc3af..011ab45 100755 --- a/scripts/fpm-bundle.sh +++ b/scripts/fpm-bundle.sh @@ -76,7 +76,7 @@ echo ===================== # aarch64 if [[ "$ARCH_LABEL" == "" ]]; then ARCH_LABEL="64bit" - case "$archs" in + case "$(uname -m)" in i?86) ARCH_LABEL="32bit" ;; aarch64) ARCH_LABEL="aarch64" ;; esac @@ -111,8 +111,11 @@ fpm -C ./root -s dir -t rpm \ --url="https://www.sketchymaze.com" # Debian Package +# NOTE: ideally wanted to depend on libsdl2 etc. but it doesn't work +# on Debian Buster to depend on either `libsdl2` or `libsdl2-2.0` nor +# on either `libsdl2-ttf` or `libsdl2-ttf-2.0` so just remove deps +# and let the user figure it out. fpm -C ./root -s dir -t deb \ - -d libsdl2-2.0 -d libsdl2-ttf-2.0 -d libsdl2-mixer-2.0 \ -a $DEB_ARCH \ -n sketchy-maze -v ${VERSION} \ --license="Copyright" \ diff --git a/scripts/release.sh b/scripts/release.sh index a13ac17..bcf77ef 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -25,7 +25,7 @@ STAGE_PATH="$(pwd)/dist/stage/${VERSION}" if [[ "$ARCH_LABEL" == "" ]]; then # Reasonable default ARCH_LABEL="64bit" - case "$archs" in + case "$(uname -m)" in i?86) ARCH_LABEL="32bit" ;; aarch64) ARCH_LABEL="aarch64" ;; esac