From b5abb8b1e1b053c5d3ddd391469edc3ed02aa22c Mon Sep 17 00:00:00 2001
From: rmspeers <ryan@riverloopsecurity.com>
Date: Wed, 28 Nov 2018 21:11:03 -0500
Subject: Updates for Python3 headless install.

---
 scripts/linux-setup.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scripts/linux-setup.sh')

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
-- 
cgit v1.3.1