Moved ps folder outside the msys2 folder

autobuild.bat

@@ -1,5 +1,5 @@
 @echo off
-call msys2\ps\setup.cmd
+call setup\setup.cmd
 taskkill /IM "gpg-agent.exe" /F 2>NUL
 echo %~dp0builds /builds ntfs noacl 0 0 >>msys2/etc/fstab
-call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /ps/autobuild.sh
+call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /setup/autobuild.sh

runme64.bat

@@ -1,5 +1,5 @@
 @echo off
 cd %~dp0
-call msys2\ps\setup.cmd
+call setup\setup.cmd
 call msys2\msys2_shell.cmd -mingw64 -defterm -no-start %*
-if not exist msys2\ps\installed64.txt msys2\msys2_shell.cmd -mingw64 -defterm -no-start %*
+if not exist setup\installed64.txt msys2\msys2_shell.cmd -mingw64 -defterm -no-start %*

msys2/ps/09-proxspace_setup.post → setup/09-proxspace_setup.post

@@ -1,15 +1,15 @@
-export PSVERSION="3.8"
+export PSVERSION="3.9"
 export LANG=en_US.UTF-8
 export PS1='\[\033]0;ProxSpace v$PSVERSION - $MSYSTEM:\w\007\033[32m\]pm3 \[\033[33m\]\w\[\033[0m\]$ '
-export PATH=/ps/bin:$PATH
+export PATH=/setup/bin:$PATH
 alias ls='ls -hF --color=auto' 
 
-if [ -f /ps/bin/ps-upgrade.new ]; then
-    rm /ps/bin/ps-upgrade
-	mv /ps/bin/ps-upgrade.new /ps/bin/ps-upgrade
+if [ -f /setup/bin/ps-upgrade.new ]; then
+    rm /setup/bin/ps-upgrade
+	mv /setup/bin/ps-upgrade.new /setup/bin/ps-upgrade
 fi
 
-if [ \( ! -f /ps/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
+if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
 	if [ "$MAYBE_FIRST_START" = "true" ]; then
 		yes | pacman -Syuu
 	else

msys2/ps/autobuild.sh → setup/autobuild.sh

@@ -78,7 +78,7 @@ function build_rrg {
 		copy_shell
 
 		#Copy contents of the autobuild folder 
-		cp -r /ps/autobuild/rrg/* "$dstDir"
+		cp -r /setup/autobuild/rrg/* "$dstDir"
 
 		#Copy the client and additional files
 		cp -r $srcDir/client/{proxmark3.exe,lualibs,luascripts,cmdscripts,dictionaries,resources} "$dstDir/client"
@@ -97,7 +97,7 @@ function build_official {
 		copy_common
 
 		#Copy contents of the autobuild folder 
-		cp -r /ps/autobuild/official/* "$dstDir"
+		cp -r /setup/autobuild/official/* "$dstDir"
 
 		#Copy the client and additional files
 		cp -r $srcDir/client/{proxmark3.exe,flasher.exe,*.dic,lualibs,scripts,hardnested} "$dstDir/client"

msys2/ps/bin/ps-info → setup/bin/ps-info

@@ -9,7 +9,7 @@ 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 /ps/installed64.txt)"
+ps_print "Installed64: $(cat /setup/installed64.txt)"
 ps_print "OLDPWD: $OLDPWD"
 ps_print "Path: $PATH"
 ps_print "arm-none-eabi-gcc: $(arm-none-eabi-gcc -dumpversion)"

msys2/ps/bin/ps-setup → setup/bin/ps-setup

@@ -9,15 +9,15 @@ check_install () {
 setup_proxspace ()
 {
   if [ "$MSYSTEM" == "MINGW64" ]; then	
-	for pkg in $(grep "^[^#;]" /ps/packages.txt); do
+	for pkg in $(grep "^[^#;]" /setup/packages.txt); do
 		check_install $pkg
 	done
 
 	python3 -m pip install ansicolors sslcrypto
 
 	yes | pacman -Sc
 
-	echo $(date '+%Y-%m-%d %H:%M:%S') > /ps/installed64.txt
+	echo $(date '+%Y-%m-%d %H:%M:%S') > /setup/installed64.txt
   fi
 }
 setup_proxspace

msys2/ps/bin/ps-upgrade → setup/bin/ps-upgrade

@@ -1,16 +1,16 @@
 rm /ps/installed64.txt &> /dev/null
 git clone https://github.com/Gator96100/ProxSpace.git /ps-upgrade
-mv /ps-upgrade/msys2/ps/bin/ps-upgrade /ps-upgrade/msys2/ps/bin/ps-upgrade.new
+mv /ps-upgrade/msys2/setup/bin/ps-upgrade /ps-upgrade/msys2/setup/bin/ps-upgrade.new
 if [ "$#" -ne 0 ]; then
 	cd /ps-upgrade
     git checkout $@
 fi
 shopt -s extglob 
-cd /ps
+cd /setup
 rm -rf -- !(bin)
-cd /ps/bin
+cd /setup/bin
 rm -rf -- !(ps-upgrade)
-cp -R /ps-upgrade/msys2/ps /
+cp -R /ps-upgrade/msys2/setup /
 rm -rf /ps-upgrade
 yes | pacman -Syuu
 echo "Please restart ProxSpace"

msys2/ps/setup.cmd → setup/setup.cmd

@@ -1,11 +1,12 @@
 @echo off
 SET PATH=%cd%\msys2\usr\bin;%PATH%
-copy /Y %cd%\msys2\ps\*.post %cd%\msys2\etc\post-install\ >NUL
-copy /Y %cd%\msys2\ps\*.conf %cd%\msys2\etc\ >NUL
+copy /Y %cd%\setup\*.post %cd%\msys2\etc\post-install\ >NUL
+copy /Y %cd%\setup\*.conf %cd%\msys2\etc\ >NUL
 
 echo # For a description of the file format, see the Users Guide >%cd%\msys2/etc/fstab 
 echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>%cd%\msys2/etc/fstab 
 echo none / cygdrive binary,posix=0,noacl,user 0 0 >>%cd%\msys2/etc/fstab
+echo %cd%\setup /setup ntfs noacl 0 0 >>%cd%\msys2/etc/fstab
 echo %cd%\pm3 /pm3 ntfs noacl 0 0 >>%cd%\msys2/etc/fstab
 
 dash /usr/bin/rebaseall -p 2> nul
@@ -14,5 +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
+bash /setup/startup_checks.sh
+bash /setup/user_setup.sh