Skip to content

Commit 812dce1

Browse files
committed
Set $ARCH to current architecture when not set
1 parent f623dda commit 812dce1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

linuxdeploy-plugin-conda.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ fi
99

1010
script=$(readlink -f "$0")
1111

12+
ARCH="${ARCH:-"$(uname -m)"}"
13+
1214
show_usage() {
1315
echo "Usage: $script --appdir <path to AppDir>"
1416
echo
@@ -20,7 +22,7 @@ show_usage() {
2022
echo " CONDA_PYTHON_VERSION=\"3.6\""
2123
echo " PIP_REQUIREMENTS=\"packageA packageB -r requirements.txt -e git+https://...\""
2224
echo " PIP_PREFIX=\"AppDir/usr/share/conda\""
23-
echo " ARCH=\"x86_64\" (further supported values: i686)"
25+
echo " ARCH=\"$ARCH\" (supported values: x86_64, i368, i686)"
2426
echo " CONDA_SKIP_CLEANUP=\"[all;][conda-pkgs;][__pycache__;][strip;][.a;][cmake;][doc;][man;][site-packages;]\""
2527
}
2628

@@ -99,8 +101,6 @@ if [ -d "$APPDIR"/usr/conda ]; then
99101
log "Please make sure you perform a clean build before releases to make sure your process works properly."
100102
fi
101103

102-
ARCH=${ARCH:-x86_64}
103-
104104
# install Miniconda, a self contained Python distribution, into AppDir
105105
case "$ARCH" in
106106
"x86_64")

0 commit comments

Comments
 (0)