From 812dce1b0f6bc16623328e54a5074848e8ba7462 Mon Sep 17 00:00:00 2001 From: Frank Stettner Date: Wed, 9 Jun 2021 23:50:05 +0200 Subject: [PATCH] Set $ARCH to current architecture when not set --- linuxdeploy-plugin-conda.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linuxdeploy-plugin-conda.sh b/linuxdeploy-plugin-conda.sh index 599fece..f798100 100755 --- a/linuxdeploy-plugin-conda.sh +++ b/linuxdeploy-plugin-conda.sh @@ -9,6 +9,8 @@ fi script=$(readlink -f "$0") +ARCH="${ARCH:-"$(uname -m)"}" + show_usage() { echo "Usage: $script --appdir " echo @@ -20,7 +22,7 @@ show_usage() { echo " CONDA_PYTHON_VERSION=\"3.6\"" echo " PIP_REQUIREMENTS=\"packageA packageB -r requirements.txt -e git+https://...\"" echo " PIP_PREFIX=\"AppDir/usr/share/conda\"" - echo " ARCH=\"x86_64\" (further supported values: i686)" + echo " ARCH=\"$ARCH\" (supported values: x86_64, i368, i686)" echo " CONDA_SKIP_CLEANUP=\"[all;][conda-pkgs;][__pycache__;][strip;][.a;][cmake;][doc;][man;][site-packages;]\"" } @@ -99,8 +101,6 @@ if [ -d "$APPDIR"/usr/conda ]; then log "Please make sure you perform a clean build before releases to make sure your process works properly." fi -ARCH=${ARCH:-x86_64} - # install Miniconda, a self contained Python distribution, into AppDir case "$ARCH" in "x86_64")