From 5bc8dbdc7504b55b0395facb46312f7791792ae4 Mon Sep 17 00:00:00 2001
From: Gator96100 <jupuerzi@gmx.at>
Date: Mon, 17 Aug 2020 14:44:43 +0200
Subject: [PATCH] Added downloaded by git check

---
 msys2/ps/setup.cmd         |  1 +
 msys2/ps/startup_checks.sh | 13 +++++++++++++
 msys2/ps/user_setup.sh     |  5 -----
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 msys2/ps/startup_checks.sh

diff --git a/msys2/ps/setup.cmd b/msys2/ps/setup.cmd
index bfbc41e16..b4eb02205 100644
--- a/msys2/ps/setup.cmd
+++ b/msys2/ps/setup.cmd
@@ -15,4 +15,5 @@ del %cd%\msys2\etc\passwd 2> nul
 del %cd%\msys2\etc\group 2> nul
 touch /etc/passwd
 touch /etc/group
+bash /ps/startup_checks.sh
 bash /ps/user_setup.sh
diff --git a/msys2/ps/startup_checks.sh b/msys2/ps/startup_checks.sh
new file mode 100644
index 000000000..4e087f9e9
--- /dev/null
+++ b/msys2/ps/startup_checks.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+#Check for an invalid ProxSpace path
+if ! (echo "$PWD" | grep -Eq  ^[a-zA-Z0-9\/\._\-]+$) ; then
+    echo "Error: Install path contains special characters!"
+	sleep infinity 
+fi
+
+#Using git to download ProxSpace will cause an installation error
+if [ -d "$PWD/.git" ]; then
+    echo "Error: Do not use Git to download ProxSpace!"
+    sleep infinity 
+fi
\ No newline at end of file
diff --git a/msys2/ps/user_setup.sh b/msys2/ps/user_setup.sh
index 1cb342ac0..81f489ff7 100644
--- a/msys2/ps/user_setup.sh
+++ b/msys2/ps/user_setup.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-if ! (echo "$PWD" | grep -Eq  ^[a-zA-Z0-9\/\._\-]+$) ; then
-    echo "Error: Install path contains special characters!"
-	sleep infinity 
-fi
-
 MKPASSWD_CURRENT="$( mkpasswd -c )"
 MKGROUP_CURRENT="$( mkgroup -c )"
 USER_SID="$( echo $MKPASSWD_CURRENT | gawk -F":" '{ print $5 }' )"