Skip to content

Commit

Permalink
Merge pull request #40 from knarfS/arch
Browse files Browse the repository at this point in the history
Determine architecture when $ARCH not set
  • Loading branch information
TheAssassin authored Jun 11, 2021
2 parents f623dda + 812dce1 commit 0ead8b8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions linuxdeploy-plugin-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ fi

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

ARCH="${ARCH:-"$(uname -m)"}"

show_usage() {
echo "Usage: $script --appdir <path to AppDir>"
echo
Expand All @@ -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;]\""
}

Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 0ead8b8

Please sign in to comment.