From 5698e7108e5827dd084a142cff68f8125dfe6705 Mon Sep 17 00:00:00 2001
From: Elia Farin <efarin@inoc.com>
Date: Fri, 30 May 2025 16:36:22 -0500
Subject: [PATCH] Updated install.sh and webinstall.sh to not add extraneous
 copies of path and STEAMTRICKS_PREFIX

---
 install.sh    | 16 +++++++++++-----
 webinstall.sh | 12 +++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index 5f82534..545fd0d 100755
--- a/install.sh
+++ b/install.sh
@@ -10,13 +10,19 @@ unsupported_shell () {
 
 install () {
 	export SHELLPROFILE="$1"
-	mkdir $HOME/.steamtricks
-	cp -r steamtricks/* $HOME/.steamtricks
+	if [ -d "$HOME/.steamtricks" ]; then
+	else
+		mkdir $HOME/.steamtricks
+	fi
+	cp -r steamtricks/* $HOME/.steamtricks/
 	chmod 755 $HOME/.steamtricks/bin/steamtricks
-	echo "export STEAMTRICKS_PREFIX=\"$HOME/.steamtricks\"">>"${SHELLPROFILE}"
-	echo "export PATH=\"\$PATH:$HOME/.steamtricks/bin\"">>"${SHELLPROFILE}"
+	if [ -z "$STEAMTRICKS_PREFIX" ]; then
+		echo "export STEAMTRICKS_PREFIX=\"$HOME/.steamtricks\"">>"${SHELLPROFILE}"
+	fi
 
-	echo "Install completed! Please source your profile $SHELLPROFILE to load the changes!"
+	if [ -z "$(echo $PATH | grep 'steamtricks')" ]; then
+		echo "Install completed! Please source your profile $SHELLPROFILE to load the changes!"
+	fi
 }
 
 install_manager () {
diff --git a/webinstall.sh b/webinstall.sh
index 993cd4c..c7fde0d 100755
--- a/webinstall.sh
+++ b/webinstall.sh
@@ -12,10 +12,16 @@ unsupported_shell () {
 
 install () {
 	export SHELLPROFILE="$1"
-  curl "$DOWNLOADURL" | tar -xvC $HOME/
+  curl "$DOWNLOADURL" | tar -xvC $HOME/ || echo "Could not install steamtricks" && exit 1
 	chmod 755 $HOME/.steamtricks/bin/steamtricks
-	echo "export STEAMTRICKS_PREFIX=\"$HOME/.steamtricks\"">>"${SHELLPROFILE}"
-	echo "export PATH=\"\$PATH:$HOME/.steamtricks/bin\"">>"${SHELLPROFILE}"
+
+  if [ -z "$STEAMTRICKS_PREFIX" ]; then
+		echo "export STEAMTRICKS_PREFIX=\"$HOME/.steamtricks\"">>"${SHELLPROFILE}"
+	fi
+
+	if [ -z "$(echo $PATH | grep 'steamtricks')" ]; then
+		echo "Install completed! Please source your profile $SHELLPROFILE to load the changes!"
+	fi
 
 	echo "Install completed! Please source your profile $SHELLPROFILE to load the changes!"
 }