From a210023d86813befc57c64fd6e47b09c77689101 Mon Sep 17 00:00:00 2001
From: gator96100 <jupuerzi@gmx.at>
Date: Sat, 27 Oct 2018 01:08:56 +0200
Subject: [PATCH] Downgraded to readline6 and updated gcc to 8.2.0-3

---
 msys2/autobuild.sh                       |  2 +-
 msys2/etc/post-install/09-proxspace.post | 45 ++++++++++++++++++------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/msys2/autobuild.sh b/msys2/autobuild.sh
index d51b5948c..60ec7f2bb 100644
--- a/msys2/autobuild.sh
+++ b/msys2/autobuild.sh
@@ -39,7 +39,7 @@ for i in $( ls ); do
 	  mkdir -p "$buildDir/$i/firmware_win/JTAG Only"
 	  mkdir -p "$buildDir/$i/Windows Driver"
 	  #you have to thank QT5 for all that dlls
-	  cp $mingwDir/bin/{libbz2-1.dll,libfreetype-6.dll,libgcc_s_dw2-1.dll,libglib-2.0-0.dll,libgraphite2.dll,libharfbuzz-0.dll,libiconv-2.dll,libicudt61.dll,libicuin61.dll,libicuuc61.dll,libintl-8.dll,libpcre-1.dll,libpcre2-16-0.dll,libpng16-16.dll,libreadline7.dll,libstdc++-6.dll,libtermcap-0.dll,libwinpthread-1.dll,Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,zlib1.dll,libgcc_s_seh-1.dll,libjansson-4.dll} $buildDir/$i/win$arch
+	  cp $mingwDir/bin/{libbz2-1.dll,libfreetype-6.dll,libgcc_s_dw2-1.dll,libglib-2.0-0.dll,libgraphite2.dll,libharfbuzz-0.dll,libiconv-2.dll,libicudt61.dll,libicuin61.dll,libicuuc61.dll,libintl-8.dll,libpcre-1.dll,libpcre2-16-0.dll,libpng16-16.dll,libreadline6.dll,libstdc++-6.dll,libtermcap-0.dll,libwinpthread-1.dll,Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,zlib1.dll,libgcc_s_seh-1.dll,libjansson-4.dll} $buildDir/$i/win$arch
 	  cp -r /autobuild/* $buildDir/$i/win$arch
 	  cp -r $pm3Dir/$i/client/{proxmark3.exe,flasher.exe,*.dic,lualibs,scripts,hardnested} $buildDir/$i/win$arch
 	  cp $mingwDir/share/qt5/plugins/platforms/qwindows.dll $buildDir/$i/win$arch/platforms
diff --git a/msys2/etc/post-install/09-proxspace.post b/msys2/etc/post-install/09-proxspace.post
index 7ea0af1e9..7a5b62834 100644
--- a/msys2/etc/post-install/09-proxspace.post
+++ b/msys2/etc/post-install/09-proxspace.post
@@ -1,16 +1,41 @@
-maybe_proxspace ()
+check_install ()
 { 
-  if [ ! -d /mingw64/include/readline ] && [ "$MSYSTEM" == "MINGW64" ]; then
-  
-    wget https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz https://github.com/Gator96100/ProxSpace-Repo/raw/master/mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz
-	pacman --noconfirm --force -U mingw-w64-x86_64-gcc-libs-8.2.0-1-any.pkg.tar.xz mingw-w64-x86_64-gcc-8.2.0-1-any.pkg.tar.xz
-	rm mingw-w64-x86_64-gcc-*.tar.xz
-	pacman --noconfirm --force -S mingw-w64-x86_64-readline mingw-w64-x86_64-qt5 git make pkg-config mingw-w64-x86_64-jansson
+	pacman -Q $1 > /dev/null
+	if [ $? == 1 ]; then
+		pacman --noconfirm --force -S $1
+	fi
+}
+
+check_install_web ()
+{ 
+	pacman -Q $1 | grep $2 > /dev/null
+	if [ $? == 1 ]; then
+		pacman --noconfirm --force -U $3
+	fi
+}
+
+setup_proxspace ()
+{ 
+  if [ "$MSYSTEM" == "MINGW64" ]; then
+	check_install_web mingw-w64-x86_64-gcc-libs 8.2.0-3 http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-8.2.0-3-any.pkg.tar.xz
+	check_install_web mingw-w64-x86_64-gcc 8.2.0-3 http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-8.2.0-3-any.pkg.tar.xz
+	check_install_web mingw-w64-x86_64-readline 6.3 http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-6.3.008-1-any.pkg.tar.xz
+	check_install git
+	check_install make
+	check_install pkg-config
+	check_install mingw-w64-x86_64-jansson
+	check_install mingw-w64-x86_64-qt5
   fi
   
-  if [ ! -d /mingw32/include/readline ] && [ "$MSYSTEM" == "MINGW32" ]; then
-    pacman --noconfirm --force -S mingw-w64-i686-gcc mingw-w64-i686-readline mingw-w64-i686-qt5 git make pkg-config mingw-w64-i686-jansson
+  if [ "$MSYSTEM" == "MINGW32" ]; then
+	check_install_web mingw-w64-i686-readline 6.3 http://repo.msys2.org/mingw/i686/mingw-w64-i686-readline-6.3.008-1-any.pkg.tar.xz
+	check_install mingw-w64-i686-gcc
+	check_install git
+	check_install make
+	check_install pkg-config
+	check_install mingw-w64-i686-jansson
+	check_install mingw-w64-i686-qt5      
   fi
 }
 
-maybe_proxspace
+setup_proxspace
\ No newline at end of file