summaryrefslogtreecommitdiff
path: root/scripts/linux-setup.sh
diff options
context:
space:
mode:
authorJordan Wiens <jordan@psifertex.com>2018-11-29 00:02:50 -0500
committerJordan Wiens <jordan@psifertex.com>2018-12-04 18:05:41 -0500
commite77c5694a32d1ba8b70127410b4c26cb12e994d2 (patch)
tree6074004d64bbd5a6a326413e471c17db791ac218 /scripts/linux-setup.sh
parent441631a7376a304f5e06cbbae74cf9eef70414cf (diff)
linux setup supports both python 2 and 3 side-by-side now
Diffstat (limited to 'scripts/linux-setup.sh')
-rwxr-xr-xscripts/linux-setup.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh
index 30b7e6c3..4c9be22e 100755
--- a/scripts/linux-setup.sh
+++ b/scripts/linux-setup.sh
@@ -67,10 +67,12 @@ pythonpath()
echo Configuring python path
if [ "$USERINTERACTIVE" == "true" ]
then
- ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT
+ SILENT="-s"
else
- ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT -s
+ SILENT=""
fi
+ python -V >/dev/null 2>&1 && ${SUDO}python ${BNPATH}/scripts/install_api.py ${ROOT} ${SILENT}
+ python3 -V >/dev/null 2>&1 && ${SUDO}python3 ${BNPATH}/scripts/install_api.py ${ROOT} ${SILENT}
}
createdesktopfile()