From d9e2d2ff81ac214ed8296507b5564a6b76f90596 Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Sun, 19 Nov 2017 16:29:26 -0500
Subject: Fix bugs in setup script by removing unneeded sudo conditionals

---
 scripts/linux-setup.sh | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

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

diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh
index 02af9623..e18082e1 100755
--- a/scripts/linux-setup.sh
+++ b/scripts/linux-setup.sh
@@ -81,14 +81,9 @@ Type=Application
 Categories=Utility;
 Comment=${APPCOMMENT}
 EOF
-	if [ "${ROOT}" == "root" ]
-	then
-		echo "${DESKTOP}" | $SUDO tee ${DESKTOPFILE} >/dev/null
-		$SUDO chmod +x ${DESKTOPFILE}
-		$SUDO update-desktop-database ${SHARE}/applications
-	else
-		echo "${DESKTOP}" > ${HOME}/Desktop/${APP}.desktop
-	fi
+	echo "${DESKTOP}" | $SUDO tee ${DESKTOPFILE} >/dev/null
+	$SUDO chmod +x ${DESKTOPFILE}
+	$SUDO update-desktop-database ${SHARE}/applications
 }
 
 createmime()
@@ -108,16 +103,12 @@ createmime()
 		<glob pattern=\"*.${EXT}\"/>
 		<sub-class-of type=\"application/x-sqlite3\" />
 	</mime-type>
-</mime-info>"| $SUDO tee ${MIMEFILE} >/dev/null
+</mime-info>"| $SUDO tee ${MIMEFILEbinary} >/dev/null
 
 	#echo Copying icon
 	#$SUDO cp $PNG $IMAGEFILE
-	if [ "${ROOT}" == "root" ]
-	then
-		$SUDO cp ${PNG} ${IMAGEFILE}
-		$SUDO update-mime-database ${SHARE}/mime
-	fi
-
+	$SUDO cp ${PNG} ${IMAGEFILE}
+	$SUDO update-mime-database ${SHARE}/mime
 }
 
 addtodesktop()
@@ -127,11 +118,8 @@ addtodesktop()
 
 uninstall()
 {
-	rm -i -r $DESKTOPFILE $MIMEFILE $IMAGEFILE
-	if [ "$ROOT" == "root" ]
-	then
-		$SUDO update-mime-database ${SHARE}/mime
-	fi
+	rm -i -r $DESKTOPFILE $MIMEFILE $IMAGEFILE ${HOME}/Desktop/${APP}.desktop
+	$SUDO update-mime-database ${SHARE}/mime
 	exit 0
 }
 
-- 
cgit v1.3.1