summaryrefslogtreecommitdiff
path: root/scripts/linux-setup.sh
diff options
context:
space:
mode:
authorrmspeers <ryan@riverloopsecurity.com>2018-11-28 21:11:03 -0500
committerJordan <jordan@psifertex.com>2018-11-29 00:01:10 -0500
commitb5abb8b1e1b053c5d3ddd391469edc3ed02aa22c (patch)
treed556192a229f7270f3fd8ffc53e3538bd6bef06d /scripts/linux-setup.sh
parent161786fc483515615399ba990254fba8d7d42876 (diff)
Updates for Python3 headless install.
Diffstat (limited to 'scripts/linux-setup.sh')
-rwxr-xr-xscripts/linux-setup.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh
index 655af22d..f2d61589 100755
--- a/scripts/linux-setup.sh
+++ b/scripts/linux-setup.sh
@@ -65,11 +65,11 @@ lastrun()
pythonpath()
{
echo Configuring python path
- if [[ $(python -V) == "Python 3."* ]]
+ if [ "USERINTERACTIVE" == "true" ]
then
- ${SUDO}python2 ${BNPATH}/scripts/install_api.py $ROOT
- else
${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT
+ else
+ ${SUDO}python ${BNPATH}/scripts/install_api.py $ROOT -s
fi
}
@@ -139,6 +139,7 @@ CREATEDESKTOP=true
CREATEMIME=true
ADDTODESKTOP=true
CREATELASTRUN=true
+USERINTERACTIVE=true
PYTHONPATH=true
UNINSTALL=false
@@ -158,6 +159,7 @@ do
;;
-d)
ADDTODESKTOP=false
+ CREATEDESKTOP=false
;;
-m)
CREATEMIME=false
@@ -169,6 +171,7 @@ do
ADDTODESKTOP=false
CREATEMIME=false
CREATEDESKTOP=false
+ USERINTERACTIVE=false
;;
-h|*)
usage