GlcoinCore/joininbox
1
0
Fork 0
mirror of https://github.com/openoms/joininbox.git synced 2026-08-19 13:18:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow setting specific python version (#73)

Browse source
This commit is contained in:
Taylor Helsper 2021-12-15 01:58:58 -06:00 • committed by GitHub
parent cbdf91f560
commit e802ff0753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/install.joinmarket.sh
View file

@ -83,6 +83,11 @@ function installJoinMarket() {
fi
fi
# Use specific python version, if set
python_args=""
if [[ ! -z "${JM_PYTHON}" ]]; then
python_args="--python=${JM_PYTHON}"
fi
# do not clear screen during installation
sudo -u joinmarket sed -i 's/clear//g' install.sh
# do not stop at installing Debian dependencies
@ -106,10 +111,10 @@ function installJoinMarket() {
if [ "$1" = "update" ] || [ "$1" = "testPR" ] || [ "$1" = "commit" ]; then
# build the Qt GUI, do not run libsecp256k1 test
sudo -u joinmarket ./install.sh --with-qt --disable-secp-check || exit 1
sudo -u joinmarket ./install.sh --with-qt --disable-secp-check $python_args || exit 1
else
# build the Qt GUI
sudo -u joinmarket ./install.sh --with-qt || exit 1
sudo -u joinmarket ./install.sh --with-qt $python_args || exit 1
fi
currentJMversion=$(cd /home/joinmarket/joinmarket-clientserver 2>/dev/null; \
git describe --tags 2>/dev/null)
@ -180,4 +185,4 @@ if [ "$1" = "commit" ]; then
installJoinMarket commit
errorOnInstall $?
exit 0
fi
fi