diff --git a/autobuild.bat b/autobuild.bat index 0cafd27df..6a10c1aa2 100644 --- a/autobuild.bat +++ b/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 \ No newline at end of file +call msys2\msys2_shell.cmd -mingw64 -defterm -no-start -c /setup/autobuild.sh \ No newline at end of file diff --git a/runme64.bat b/runme64.bat index 026eb1ae2..383b02a7b 100644 --- a/runme64.bat +++ b/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 %* \ No newline at end of file +if not exist setup\installed64.txt msys2\msys2_shell.cmd -mingw64 -defterm -no-start %* \ No newline at end of file diff --git a/msys2/ps/09-proxspace_setup.post b/setup/09-proxspace_setup.post similarity index 57% rename from msys2/ps/09-proxspace_setup.post rename to setup/09-proxspace_setup.post index dbc9748f7..7aedcf99a 100644 --- a/msys2/ps/09-proxspace_setup.post +++ b/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 diff --git a/msys2/ps/autobuild.sh b/setup/autobuild.sh similarity index 97% rename from msys2/ps/autobuild.sh rename to setup/autobuild.sh index c46c0f0c4..96c807ddf 100644 --- a/msys2/ps/autobuild.sh +++ b/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" diff --git a/msys2/ps/autobuild/official/FLASH - All.bat b/setup/autobuild/official/FLASH - All.bat similarity index 100% rename from msys2/ps/autobuild/official/FLASH - All.bat rename to setup/autobuild/official/FLASH - All.bat diff --git a/msys2/ps/autobuild/official/FLASH - Bootrom.bat b/setup/autobuild/official/FLASH - Bootrom.bat similarity index 100% rename from msys2/ps/autobuild/official/FLASH - Bootrom.bat rename to setup/autobuild/official/FLASH - Bootrom.bat diff --git a/msys2/ps/autobuild/official/FLASH - fullimage.bat b/setup/autobuild/official/FLASH - fullimage.bat similarity index 100% rename from msys2/ps/autobuild/official/FLASH - fullimage.bat rename to setup/autobuild/official/FLASH - fullimage.bat diff --git a/msys2/ps/autobuild/official/Go.bat b/setup/autobuild/official/Go.bat similarity index 100% rename from msys2/ps/autobuild/official/Go.bat rename to setup/autobuild/official/Go.bat diff --git a/msys2/ps/autobuild/official/client/setup.bat b/setup/autobuild/official/client/setup.bat similarity index 100% rename from msys2/ps/autobuild/official/client/setup.bat rename to setup/autobuild/official/client/setup.bat diff --git a/msys2/ps/autobuild/rrg/client/setup.bat b/setup/autobuild/rrg/client/setup.bat similarity index 100% rename from msys2/ps/autobuild/rrg/client/setup.bat rename to setup/autobuild/rrg/client/setup.bat diff --git a/msys2/ps/autobuild/rrg/pm3-flash-all.bat b/setup/autobuild/rrg/pm3-flash-all.bat similarity index 100% rename from msys2/ps/autobuild/rrg/pm3-flash-all.bat rename to setup/autobuild/rrg/pm3-flash-all.bat diff --git a/msys2/ps/autobuild/rrg/pm3-flash-bootrom.bat b/setup/autobuild/rrg/pm3-flash-bootrom.bat similarity index 100% rename from msys2/ps/autobuild/rrg/pm3-flash-bootrom.bat rename to setup/autobuild/rrg/pm3-flash-bootrom.bat diff --git a/msys2/ps/autobuild/rrg/pm3-flash-fullimage.bat b/setup/autobuild/rrg/pm3-flash-fullimage.bat similarity index 100% rename from msys2/ps/autobuild/rrg/pm3-flash-fullimage.bat rename to setup/autobuild/rrg/pm3-flash-fullimage.bat diff --git a/msys2/ps/autobuild/rrg/pm3.bat b/setup/autobuild/rrg/pm3.bat similarity index 100% rename from msys2/ps/autobuild/rrg/pm3.bat rename to setup/autobuild/rrg/pm3.bat diff --git a/msys2/ps/bin/pm3 b/setup/bin/pm3 similarity index 100% rename from msys2/ps/bin/pm3 rename to setup/bin/pm3 diff --git a/msys2/ps/bin/pm3-flash b/setup/bin/pm3-flash similarity index 100% rename from msys2/ps/bin/pm3-flash rename to setup/bin/pm3-flash diff --git a/msys2/ps/bin/pm3-flash-all b/setup/bin/pm3-flash-all similarity index 100% rename from msys2/ps/bin/pm3-flash-all rename to setup/bin/pm3-flash-all diff --git a/msys2/ps/bin/pm3-flash-bootrom b/setup/bin/pm3-flash-bootrom similarity index 100% rename from msys2/ps/bin/pm3-flash-bootrom rename to setup/bin/pm3-flash-bootrom diff --git a/msys2/ps/bin/pm3-flash-fullimage b/setup/bin/pm3-flash-fullimage similarity index 100% rename from msys2/ps/bin/pm3-flash-fullimage rename to setup/bin/pm3-flash-fullimage diff --git a/msys2/ps/bin/ps-info b/setup/bin/ps-info similarity index 92% rename from msys2/ps/bin/ps-info rename to setup/bin/ps-info index 8bb3686da..9856762eb 100644 --- a/msys2/ps/bin/ps-info +++ b/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)" diff --git a/msys2/ps/bin/ps-rankmirrors b/setup/bin/ps-rankmirrors similarity index 100% rename from msys2/ps/bin/ps-rankmirrors rename to setup/bin/ps-rankmirrors diff --git a/msys2/ps/bin/ps-repair b/setup/bin/ps-repair similarity index 100% rename from msys2/ps/bin/ps-repair rename to setup/bin/ps-repair diff --git a/msys2/ps/bin/ps-setup b/setup/bin/ps-setup similarity index 73% rename from msys2/ps/bin/ps-setup rename to setup/bin/ps-setup index 4939e0632..26add61b3 100644 --- a/msys2/ps/bin/ps-setup +++ b/setup/bin/ps-setup @@ -9,7 +9,7 @@ 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 @@ -17,7 +17,7 @@ setup_proxspace () 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 \ No newline at end of file diff --git a/msys2/ps/bin/ps-upgrade b/setup/bin/ps-upgrade similarity index 68% rename from msys2/ps/bin/ps-upgrade rename to setup/bin/ps-upgrade index 1b5bd9b10..d36f98ab8 100644 --- a/msys2/ps/bin/ps-upgrade +++ b/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" diff --git a/msys2/ps/nsswitch.conf b/setup/nsswitch.conf similarity index 100% rename from msys2/ps/nsswitch.conf rename to setup/nsswitch.conf diff --git a/msys2/ps/packages.txt b/setup/packages.txt similarity index 100% rename from msys2/ps/packages.txt rename to setup/packages.txt diff --git a/msys2/ps/pacman.conf b/setup/pacman.conf similarity index 100% rename from msys2/ps/pacman.conf rename to setup/pacman.conf diff --git a/msys2/ps/setup.cmd b/setup/setup.cmd similarity index 69% rename from msys2/ps/setup.cmd rename to setup/setup.cmd index 842b71052..a02e9d65f 100644 --- a/msys2/ps/setup.cmd +++ b/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 diff --git a/msys2/ps/startup_checks.sh b/setup/startup_checks.sh similarity index 100% rename from msys2/ps/startup_checks.sh rename to setup/startup_checks.sh diff --git a/msys2/ps/user_setup.sh b/setup/user_setup.sh similarity index 100% rename from msys2/ps/user_setup.sh rename to setup/user_setup.sh