From b6c97c597353811d65cf7f40d087bf8ead80d43c Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Wed, 6 Sep 2017 22:52:46 -0700
Subject: [PATCH] Msys2 fixes

---
 cmake/msys/extract_debs.sh |  2 +-
 cmake/msys/fetch_ppa.sh    | 11 +++++++----
 cmake/msys/msys_helper.sh  |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmake/msys/extract_debs.sh b/cmake/msys/extract_debs.sh
index 508ac215a..cb2a868d3 100644
--- a/cmake/msys/extract_debs.sh
+++ b/cmake/msys/extract_debs.sh
@@ -8,7 +8,7 @@ for f in *.deb; do
 	ar xv "$f"
 	rm debian-binary
 	rm control.tar.*
-	tar xf data.tar.*
+	tar xf data.tar.* --exclude=*mingw*/bin/fluid
 	rm data.tar.*
 done
 
diff --git a/cmake/msys/fetch_ppa.sh b/cmake/msys/fetch_ppa.sh
index bd1b8a110..66eebed28 100644
--- a/cmake/msys/fetch_ppa.sh
+++ b/cmake/msys/fetch_ppa.sh
@@ -12,7 +12,7 @@ PPA_USER=tobydox
 PPA_PROJECT=mingw-x-trusty
 PPA_ROOT=$PPA_HOST/$PPA_USER/$PPA_PROJECT/ubuntu
 
-PPA_URL=$PPA_ROOT/dists/$PPA_DISTRO/main/binary-$PPA_ARCH/Packages
+PPA_URL=$PPA_ROOT/dists/$PPA_DISTRO/main/binary-$PPA_ARCH/Packages.gz
 
 ppa_dir=./ppa/
 
@@ -23,8 +23,11 @@ skip_files="binutils openssl flac libgig libogg libvorbis x-bootstrap zlib"
 skip_files="$skip_files x-runtime gcc qt_4 qt5 x-stk pkgconfig"
 skip_files="$skip_files glib2 libpng"
 
-echo "Connecting to $PPA_HOST to get list of packages..."
-wget -qO- $PPA_URL |grep "Filename:" > $temp_file
+echo "Connecting to $PPA_URL to get list of packages..."
+wget $PPA_URL -qO ${temp_file}.gz
+gzip -d ${temp_file}.gz
+cat $temp_file |grep "Filename:" > ${temp_file}_stripped
+mv ${temp_file}_stripped $temp_file
 
 for j in $skip_files ; do
 	grep -v "$j" $temp_file > $temp_temp_file
@@ -43,7 +46,7 @@ while read -r j
 do
 	echo "Downloading $j..."
 	echo "$PPA_ROOT/$j"
-	wget -O "$ppa_dir$(basename "$j")" "$(echo "$PPA_ROOT/$j" | sed 's/\/Filename: /\//gi')"
+	wget -qO "$ppa_dir$(basename "$j")" "$(echo "$PPA_ROOT/$j" | sed 's/\/Filename: /\//gi')"
 done < $temp_file
 
 
diff --git a/cmake/msys/msys_helper.sh b/cmake/msys/msys_helper.sh
index af7fb6793..294edd476 100644
--- a/cmake/msys/msys_helper.sh
+++ b/cmake/msys/msys_helper.sh
@@ -22,7 +22,8 @@ if ! env | grep MINGW; then
 fi
 
 info "Preparing the git directory..."
-mkdir "$HOME/.git"; touch "$HOME/.git/config" > /dev/null &2>1
+mkdir "$HOME/.git" || true
+touch "$HOME/.git/config" > /dev/null 2>&1
 git config --global http.sslverify false
 
 info "Cloning the repository..."