From 4997e5cb17997547bb627c43d9cd52d2e5af5471 Mon Sep 17 00:00:00 2001
From: Robbie Vercammen <robbievercammen@Robbies-MacBook-Pro.local>
Date: Fri, 19 Jul 2019 00:29:28 +0200
Subject: [PATCH 1/4] Added quotes to the includes so that directory with
 spaces are recognized correctly

---
 bootstrap-vitasdk.sh | 2 +-
 install-all.sh       | 2 +-
 vitasdk-update       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-vitasdk.sh b/bootstrap-vitasdk.sh
index dde32bf..5305256 100755
--- a/bootstrap-vitasdk.sh
+++ b/bootstrap-vitasdk.sh
@@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 INSTALLDIR="${VITASDK:-/usr/local/vitasdk}"
 
-. $DIR/include/install-vitasdk.sh
+. "$DIR/include/install-vitasdk.sh"
 
 if [ -d "$INSTALLDIR" ]; then
   echo "$INSTALLDIR already exists. Remove it first (e.g. 'sudo rm -rf $INSTALLDIR' or 'rm -rf $INSTALLDIR') and then restart this script"
diff --git a/install-all.sh b/install-all.sh
index 33e3de6..5ffcfed 100755
--- a/install-all.sh
+++ b/install-all.sh
@@ -4,6 +4,6 @@ set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-. $DIR/include/install-packages.sh
+. "$DIR/include/install-packages.sh"
 
 install_packages
diff --git a/vitasdk-update b/vitasdk-update
index c3e4839..7a9df5e 100755
--- a/vitasdk-update
+++ b/vitasdk-update
@@ -10,8 +10,8 @@ if [ -z "$VITASDK" ]; then
   exit 1
 fi
 
-. $DIR/include/install-vitasdk.sh
-. $DIR/include/install-packages.sh
+. "$DIR/include/install-vitasdk.sh"
+. "$DIR/include/install-packages.sh"
 
 echo "==> Updating vitasdk"
 install_vitasdk $VITASDK

From a8e835ec91035a7b8220cb1f9993497360a33b44 Mon Sep 17 00:00:00 2001
From: Robbie Vercammen <robbievercammen@Robbies-MacBook-Pro.local>
Date: Fri, 19 Jul 2019 01:38:10 +0200
Subject: [PATCH 2/4] INSTALLDIR will be removed if install_vitasdk fails

---
 bootstrap-vitasdk.sh            |   8 +++++++-
 include/.install-vitasdk.sh.swp | Bin 0 -> 12288 bytes
 include/install-vitasdk.sh      |  17 +++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 include/.install-vitasdk.sh.swp

diff --git a/bootstrap-vitasdk.sh b/bootstrap-vitasdk.sh
index 5305256..b85b1f8 100755
--- a/bootstrap-vitasdk.sh
+++ b/bootstrap-vitasdk.sh
@@ -5,6 +5,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 INSTALLDIR="${VITASDK:-/usr/local/vitasdk}"
 
+fallback_fail() {
+  echo "FAIL: removing $INSTALLDIR"
+  sudo rm -rf $INSTALLDIR
+  exit 1
+}
+
 . "$DIR/include/install-vitasdk.sh"
 
 if [ -d "$INSTALLDIR" ]; then
@@ -13,7 +19,7 @@ if [ -d "$INSTALLDIR" ]; then
 fi
 
 echo "==> Installing vitasdk to $INSTALLDIR"
-install_vitasdk $INSTALLDIR
+install_vitasdk $INSTALLDIR || fallback_fail
 
 echo "Please add the following to the bottom of your .bashrc:"
 printf "\033[0;36m""export VITASDK=${INSTALLDIR}""\033[0m\n"
diff --git a/include/.install-vitasdk.sh.swp b/include/.install-vitasdk.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..be97c12ac3b9835fe62a2a20f4ba24edb4b4e44b
GIT binary patch
literal 12288
zcmeI2%WoS+9LFbc;!&vJg2d$)$BL3hvm4u0XcGk}O;s7?QS79ppvsJQH{Ox=rJZpe
zv;po&Nc<rjIDyKID+qDnfQ0x5fCGqAx%9jCl7|zxH~NkA(RkML{LIWsmVe#(+s!q)
z;>-)Ai$eS=YWIHo{<VoeKNliTyImdZ1i7c;I7o^bXQtM$o{?+Hdn--*@>ZTYQR=B^
ztoBD^9l9&&ZW5)+H*RKjv{e);ukUWAX=L0uO_NCXLhFX9vF?ta#jZ}gXy6CPja5-3
zi#EpZJ0=_(iHmH24V*S`K{V>M;Z>iiOw!9QZJn;dPuKt(U;}J`4X^<=zy{a=8#uQH
zY&Ic2#_FCbSJ)`?iLtyaa>fSO02^QfY=8~00XDz}*Z><~18jf|Jb?z3FT{_}2=Vo^
zm^}Xf|M&O*-!BUB2lyTQ1bQF<KG*<nfY-q^cm+IqL5MFv2V4a;Fb}4{1bBEsh%dpX
zK!eL*4*c@G5TAh%d;mJ&ZEzL53VwJ_h)=+KpatFmi{K)78vKKKKLUS&pTT$FTks8d
z2#R%m1vs$*Hoykh02^QfY=8|s*#-`TAPS7~kQHfZNepv5+|!n7hb1pesj`*y6U3U*
zM!Pcl;?iu<9_g^%iDtpD)vYK{CZGX`&AzESbOU|sq~|zJ+0XU6H}5ppFFjamuHU@V
zsGsgOk4bJ*rHoXSNfFT+?K@WGPWQul*$bgad;e37<aMex*V~)dR##V=Et1mMTxZft
z<19^r#G2(AO;3-OM7zDflHB<3QK?d$L7k3Y#@}`#o%AVI#s)d<>SVTZ)LGp3bxtxn
zG5+CDTkFktm$y}9g3;J(?Yr&L#=_<EU;}0bd&hlj>(Vlj8TcvTq~Ksxx7s&ai`5zJ
zlkAnn+2hJiHabgcSwnBr`!q??$0i-^c!lmQkqr@qO~Z6-7UeutW@WMOWo$G>y6Y`S
z-MF$)d~DQ>^}V^dve5Iq8fD6Q;qg&rf-&!Jwyxc7whzWeTrE7DhYd~5iS0aVCk_w)
zipp^tuxcW&coX2-3=$OwBn^&)PKtNP(H<>VYofH@DepVY%+h@!4vG#2d4zVW6k3~^
zMc3_V8xFb-uCQCy9_BI(lpo~A&DE|ux{|JAbG4(5<GT^=Xs0{Sk?mN7$$O#FiIeTq
i1IqSom?k8t`ldL2w@33Z#d{$TQ<H92CvI0EZvHXlFy1Nv

literal 0
HcmV?d00001

diff --git a/include/install-vitasdk.sh b/include/install-vitasdk.sh
index ba9017c..67fe44c 100755
--- a/include/install-vitasdk.sh
+++ b/include/install-vitasdk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 get_download_link () {
   curl -sL https://github.com/vitasdk/vita-headers/raw/master/.travis.d/last_built_toolchain.py | python - $@
@@ -9,9 +10,9 @@ install_vitasdk () {
 
   case "$(uname -s)" in
      Darwin*)
-      mkdir -p $INSTALLDIR
-      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master osx)"
-      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1
+      mkdir -p $INSTALLDIR &&
+      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master osx)" &&
+      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1 &&
       rm -f "vitasdk-nightly.tar.bz2"
      ;;
 
@@ -23,16 +24,16 @@ install_vitasdk () {
         sudo mkdir -p $INSTALLDIR
         sudo chown $USER:$(id -gn $USER) $INSTALLDIR
       fi
-      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master linux)"
-      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1
+      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master linux)" &&
+      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1 &&
       rm -f "vitasdk-nightly.tar.bz2"
      ;;
 
      MSYS*|MINGW64*)
       UNIX=false
-      mkdir -p $INSTALLDIR
-      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master win)"
-      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1
+      mkdir -p $INSTALLDIR &&
+      wget -O "vitasdk-nightly.tar.bz2" "$(get_download_link master win)" &&
+      tar xf "vitasdk-nightly.tar.bz2" -C $INSTALLDIR --strip-components=1 &&
       rm -f "vitasdk-nightly.tar.bz2"
      ;;
 

From d9b434d58aaf40601ca1b5607f15d47d5657e81a Mon Sep 17 00:00:00 2001
From: Robbie Vercammen <robbievercammen@Robbies-MacBook-Pro.local>
Date: Fri, 19 Jul 2019 01:49:08 +0200
Subject: [PATCH 3/4] removed wap file

---
 include/.install-vitasdk.sh.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 include/.install-vitasdk.sh.swp

diff --git a/include/.install-vitasdk.sh.swp b/include/.install-vitasdk.sh.swp
deleted file mode 100644
index be97c12ac3b9835fe62a2a20f4ba24edb4b4e44b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2%WoS+9LFbc;!&vJg2d$)$BL3hvm4u0XcGk}O;s7?QS79ppvsJQH{Ox=rJZpe
zv;po&Nc<rjIDyKID+qDnfQ0x5fCGqAx%9jCl7|zxH~NkA(RkML{LIWsmVe#(+s!q)
z;>-)Ai$eS=YWIHo{<VoeKNliTyImdZ1i7c;I7o^bXQtM$o{?+Hdn--*@>ZTYQR=B^
ztoBD^9l9&&ZW5)+H*RKjv{e);ukUWAX=L0uO_NCXLhFX9vF?ta#jZ}gXy6CPja5-3
zi#EpZJ0=_(iHmH24V*S`K{V>M;Z>iiOw!9QZJn;dPuKt(U;}J`4X^<=zy{a=8#uQH
zY&Ic2#_FCbSJ)`?iLtyaa>fSO02^QfY=8~00XDz}*Z><~18jf|Jb?z3FT{_}2=Vo^
zm^}Xf|M&O*-!BUB2lyTQ1bQF<KG*<nfY-q^cm+IqL5MFv2V4a;Fb}4{1bBEsh%dpX
zK!eL*4*c@G5TAh%d;mJ&ZEzL53VwJ_h)=+KpatFmi{K)78vKKKKLUS&pTT$FTks8d
z2#R%m1vs$*Hoykh02^QfY=8|s*#-`TAPS7~kQHfZNepv5+|!n7hb1pesj`*y6U3U*
zM!Pcl;?iu<9_g^%iDtpD)vYK{CZGX`&AzESbOU|sq~|zJ+0XU6H}5ppFFjamuHU@V
zsGsgOk4bJ*rHoXSNfFT+?K@WGPWQul*$bgad;e37<aMex*V~)dR##V=Et1mMTxZft
z<19^r#G2(AO;3-OM7zDflHB<3QK?d$L7k3Y#@}`#o%AVI#s)d<>SVTZ)LGp3bxtxn
zG5+CDTkFktm$y}9g3;J(?Yr&L#=_<EU;}0bd&hlj>(Vlj8TcvTq~Ksxx7s&ai`5zJ
zlkAnn+2hJiHabgcSwnBr`!q??$0i-^c!lmQkqr@qO~Z6-7UeutW@WMOWo$G>y6Y`S
z-MF$)d~DQ>^}V^dve5Iq8fD6Q;qg&rf-&!Jwyxc7whzWeTrE7DhYd~5iS0aVCk_w)
zipp^tuxcW&coX2-3=$OwBn^&)PKtNP(H<>VYofH@DepVY%+h@!4vG#2d4zVW6k3~^
zMc3_V8xFb-uCQCy9_BI(lpo~A&DE|ux{|JAbG4(5<GT^=Xs0{Sk?mN7$$O#FiIeTq
i1IqSom?k8t`ldL2w@33Z#d{$TQ<H92CvI0EZvHXlFy1Nv


From afbf3fe696309df452cb94b7f3e7aaebe463562a Mon Sep 17 00:00:00 2001
From: Robbie Vercammen <robbievercammen@Robbies-MacBook-Pro.local>
Date: Fri, 19 Jul 2019 12:50:04 +0200
Subject: [PATCH 4/4] Fixed path with spaces to vdpm

---
 include/install-packages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/install-packages.sh b/include/install-packages.sh
index 02b86c6..0f4f867 100755
--- a/include/install-packages.sh
+++ b/include/install-packages.sh
@@ -5,7 +5,7 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 b() {
-	$DIR/../vdpm $1
+	"$DIR/../vdpm" $1
 }
 
 install_packages() {