From 5a265cc30aa7f4d462d07f83f47a503aa2998fee Mon Sep 17 00:00:00 2001
From: Gator96100 <jupuerzi@gmx.at>
Date: Mon, 9 Aug 2021 22:13:04 +0200
Subject: [PATCH] reinstall in case ProxSpace has been moved

---
 setup/09-proxspace_setup.post | 40 ++++++++++++++++++++++-------------
 setup/bin/ps-info             |  5 +++--
 setup/bin/ps-setup            |  8 ++++---
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/setup/09-proxspace_setup.post b/setup/09-proxspace_setup.post
index 5da125bd4..965e25bab 100644
--- a/setup/09-proxspace_setup.post
+++ b/setup/09-proxspace_setup.post
@@ -11,20 +11,30 @@ if [ -f /setup/bin/ps-upgrade.new ]; then
 	mv /setup/bin/ps-upgrade.new /setup/bin/ps-upgrade
 fi
 
-if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
-	if [ "$MAYBE_FIRST_START" = "true" ]; then
-		if [ -f "/usr/bin/update-ca-trust" ]; then 
-			sh /usr/bin/update-ca-trust
-		fi
-		rm /var/lib/pacman/sync/*
-		yes | pacman -Syuu
-		exit
-	else
-		if [ -z "$PSSKIPRANKING" ]; then
-			ps-rankmirrors
-		fi
+if [ "$MSYSTEM" == "MINGW64" ]; then
+	if [ -f /setup/installed ]; then
+		source /setup/installed
 		
-		yes | pacman -Suy
-		ps-setup
-	fi	
+		if [ "$PSINSTALLPATH" != "$OLDPWD" ]; then
+			export PSREINSTALL=1
+			ps-setup
+			unset PSREINSTALL
+		fi	
+	else
+		if [ "$MAYBE_FIRST_START" = "true" ]; then
+			if [ -f "/usr/bin/update-ca-trust" ]; then 
+				sh /usr/bin/update-ca-trust
+			fi
+			rm /var/lib/pacman/sync/*
+			yes | pacman -Syuu
+			exit
+		else
+			if [ -z "$PSSKIPRANKING" ]; then
+				ps-rankmirrors
+			fi
+		
+			yes | pacman -Suy
+			ps-setup
+		fi	
+	fi
 fi
diff --git a/setup/bin/ps-info b/setup/bin/ps-info
index 9856762eb..cadaba5c1 100644
--- a/setup/bin/ps-info
+++ b/setup/bin/ps-info
@@ -9,7 +9,8 @@ ps_print "Arch: $MSYSTEM_CARCH"
 ps_print "OS: $(wmic OS get Caption,CSDVersion,OSArchitecture,Version | awk 'NR==2')"
 ps_print "CPU: $(wmic CPU get Name | awk 'NR==2')"
 ps_print "Ram: $(wmic COMPUTERSYSTEM get TotalPhysicalMemory | awk 'NR==2')"
-ps_print "Installed64: $(cat /setup/installed64.txt)"
+ps_print "InstallDate: $PSINSTALLDATE"
+ps_print "InstallPath: $PSINSTALLPATH"
 ps_print "OLDPWD: $OLDPWD"
 ps_print "Path: $PATH"
 ps_print "arm-none-eabi-gcc: $(arm-none-eabi-gcc -dumpversion)"
@@ -17,4 +18,4 @@ ps_print "gcc: $(gcc -dumpversion)"
 ps_print "git: $(git --version)"
 ps_print "make: $(make -v)"
 ps_print "pkg-config: $(pkg-config --version)"
-ps_print "Qt: $(qmake --version)"
\ No newline at end of file
+ps_print "Qt: $(qmake --version)"
diff --git a/setup/bin/ps-setup b/setup/bin/ps-setup
index a304acbd7..705e5250b 100644
--- a/setup/bin/ps-setup
+++ b/setup/bin/ps-setup
@@ -1,7 +1,7 @@
 check_install () { 
 	echo "Installing: $1"
-	pacman -Q $1 > /dev/null
-	if [ $? == 1 ]; then
+	pacman -Q $1 &> /dev/null
+	if [ $? == 1 ] || [ -n "$PSREINSTALL" ]; then
 		pacman --noconfirm --overwrite='*' -S $1
 	fi
 }
@@ -19,7 +19,9 @@ setup_proxspace ()
 	
 	yes | pacman -Sc
 	
-	echo $(date '+%Y-%m-%d %H:%M:%S') > /setup/installed64.txt
+	echo "export PSINSTALLDATE=\"$(date '+%Y-%m-%d %H:%M:%S')\"" > /setup/installed
+	echo "export PSINSTALLPATH=\"$OLDPWD\"" >> /setup/installed
+	
   fi
 }
 setup_proxspace
\ No newline at end of file