michael.heier/mynode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prep fix for next JoinInBox release to use python3.7 on arm32

Browse Source
This commit is contained in:
Taylor Helsper 2021-12-16 22:52:30 -06:00
parent 5c18d1fc79
commit f145b5e1b3
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rootfs/standard/usr/bin/mynode_post_upgrade.sh
View File

@ -636,8 +636,14 @@ if should_install_app "joininbox" ; then
chmod -R +x ./joininbox/ chmod -R +x ./joininbox/
sudo -u joinmarket cp -rf ./joininbox/scripts/* . sudo -u joinmarket cp -rf ./joininbox/scripts/* .
# Use Python3.7 on RP4 32-bit
JM_ENV_VARS=""
if [ $IS_64_BIT = 0 ]; then
JM_ENV_VARS="export JM_PYTHON=python3.7; "
fi
# Install # Install
sudo -u joinmarket bash -c "cd /home/joinmarket/; ./install.joinmarket.sh install" || true sudo -u joinmarket bash -c "cd /home/joinmarket/; ${JM_ENV_VARS} ./install.joinmarket.sh install" || true
echo $JOININBOX_VERSION > $JOININBOX_VERSION_FILE echo $JOININBOX_VERSION > $JOININBOX_VERSION_FILE
fi fi

9
setup/setup_device.sh
View File

@ -627,6 +627,15 @@ if [ $IS_RASPI = 1 ] || [ $IS_X86 = 1 ]; then
chmod -R +x ./joininbox/ chmod -R +x ./joininbox/
sudo -u joinmarket cp -rf ./joininbox/scripts/* . sudo -u joinmarket cp -rf ./joininbox/scripts/* .
# Use Python3.7 on RP4 32-bit
JM_ENV_VARS=""
if [ $IS_64_BIT = 0 ]; then
JM_ENV_VARS="export JM_PYTHON=python3.7; "
fi
# Install
sudo -u joinmarket bash -c "cd /home/joinmarket/; ${JM_ENV_VARS} ./install.joinmarket.sh install" || true
echo $JOININBOX_VERSION > $JOININBOX_VERSION_FILE echo $JOININBOX_VERSION > $JOININBOX_VERSION_FILE
fi fi
fi fi