From 83248f55142acc9f9363f02c5c191091fedf3e42 Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Sun, 25 Nov 2018 13:40:55 -0800
Subject: [PATCH] Cleanup scripts

---
 src/scripts/dobuild.ps1        |  6 +++---
 src/scripts/mkrelease.sh       | 30 +++++++++++++++++-------------
 src/scripts/mkwininstaller.ps1 | 10 +++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/scripts/dobuild.ps1 b/src/scripts/dobuild.ps1
index f0c229c..57af3db 100644
--- a/src/scripts/dobuild.ps1
+++ b/src/scripts/dobuild.ps1
@@ -57,9 +57,9 @@ if (!$?) {
     exit 1;
 }
 
-New-Item artifacts -itemtype directory -Force | Out-Null
-scp ${server}:/tmp/zqwbuild/artifacts/* artifacts/ | Out-Null
-scp -r ${server}:/tmp/zqwbuild/release . | Out-Null
+New-Item artifacts -itemtype directory -Force         | Out-Null
+scp    ${server}:/tmp/zqwbuild/artifacts/* artifacts/ | Out-Null
+scp -r ${server}:/tmp/zqwbuild/release .              | Out-Null
 
 Write-Host -NoNewline "Building Installer....."
 src/scripts/mkwininstaller.ps1 -version $version 2>&1 | Out-Null
diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh
index c2d86dd..07bb145 100755
--- a/src/scripts/mkrelease.sh
+++ b/src/scripts/mkrelease.sh
@@ -82,13 +82,16 @@ echo "[OK]"
 echo -n "Packaging.............."
 mkdir bin/zec-qt-wallet-v$APP_VERSION > /dev/null
 strip zec-qt-wallet
-cp zec-qt-wallet bin/zec-qt-wallet-v$APP_VERSION > /dev/null
-cp $ZCASH_DIR/artifacts/zcashd bin/zec-qt-wallet-v$APP_VERSION > /dev/null
+
+cp zec-qt-wallet                  bin/zec-qt-wallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/zcashd    bin/zec-qt-wallet-v$APP_VERSION > /dev/null
 cp $ZCASH_DIR/artifacts/zcash-cli bin/zec-qt-wallet-v$APP_VERSION > /dev/null
-cp README.md bin/zec-qt-wallet-v$APP_VERSION > /dev/null
-cp LICENSE bin/zec-qt-wallet-v$APP_VERSION > /dev/null
+cp README.md                      bin/zec-qt-wallet-v$APP_VERSION > /dev/null
+cp LICENSE                        bin/zec-qt-wallet-v$APP_VERSION > /dev/null
+
 cd bin && tar cvf linux-zec-qt-wallet-v$APP_VERSION.tar.gz zec-qt-wallet-v$APP_VERSION/ > /dev/null
 cd .. 
+
 mkdir artifacts >/dev/null 2>&1
 cp bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz
 echo "[OK]"
@@ -111,22 +114,22 @@ fi
 echo -n "Building deb..........."
 debdir=bin/deb/zec-qt-wallet-v$APP_VERSION
 mkdir -p $debdir > /dev/null
-mkdir $debdir/DEBIAN
+mkdir    $debdir/DEBIAN
 mkdir -p $debdir/usr/local/bin
 
 cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control
 
-cp zec-qt-wallet $debdir/usr/local/bin/
+cp zec-qt-wallet               $debdir/usr/local/bin/
 cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd
 
 mkdir -p $debdir/usr/share/pixmaps/
-cp res/zec-qt-wallet.xpm $debdir/usr/share/pixmaps/
+cp res/zec-qt-wallet.xpm       $debdir/usr/share/pixmaps/
 
 mkdir -p $debdir/usr/share/applications
-cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop
+cp src/scripts/desktopentry    $debdir/usr/share/applications/zec-qt-wallet.desktop
 
 dpkg-deb --build $debdir >/dev/null
-cp $debdir.deb artifacts/linux-deb-zec-qt-wallet-v$APP_VERSION.deb
+cp $debdir.deb                 artifacts/linux-deb-zec-qt-wallet-v$APP_VERSION.deb
 echo "[OK]"
 
 
@@ -170,13 +173,14 @@ echo "[OK]"
 
 echo -n "Packaging.............."
 mkdir release/zec-qt-wallet-v$APP_VERSION  
-cp release/zec-qt-wallet.exe release/zec-qt-wallet-v$APP_VERSION 
-cp $ZCASH_DIR/artifacts/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
+cp release/zec-qt-wallet.exe          release/zec-qt-wallet-v$APP_VERSION 
+cp $ZCASH_DIR/artifacts/zcashd.exe    release/zec-qt-wallet-v$APP_VERSION > /dev/null
 cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zec-qt-wallet-v$APP_VERSION > /dev/null
-cp README.md release/zec-qt-wallet-v$APP_VERSION 
-cp LICENSE release/zec-qt-wallet-v$APP_VERSION 
+cp README.md                          release/zec-qt-wallet-v$APP_VERSION 
+cp LICENSE                            release/zec-qt-wallet-v$APP_VERSION 
 cd release && zip -r Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
 cd ..
+
 mkdir artifacts >/dev/null 2>&1
 cp release/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/
 echo "[OK]"
diff --git a/src/scripts/mkwininstaller.ps1 b/src/scripts/mkwininstaller.ps1
index 09845ed..8b65c91 100644
--- a/src/scripts/mkwininstaller.ps1
+++ b/src/scripts/mkwininstaller.ps1
@@ -4,14 +4,14 @@ param (
 
 $target="zec-qt-wallet-v$version"
 
-Remove-Item -Path release/wininstaller -Recurse | Out-Null
+Remove-Item -Path release/wininstaller -Recurse   | Out-Null
 New-Item release/wininstaller -itemtype directory | Out-Null
 
 Copy-Item release/$target/zec-qt-wallet.exe release/wininstaller/
-Copy-Item release/$target/LICENSE release/wininstaller/
-Copy-Item release/$target/README.md release/wininstaller/
-Copy-Item release/$target/zcashd.exe release/wininstaller/
-Copy-Item release/$target/zcash-cli.exe release/wininstaller/
+Copy-Item release/$target/LICENSE           release/wininstaller/
+Copy-Item release/$target/README.md         release/wininstaller/
+Copy-Item release/$target/zcashd.exe        release/wininstaller/
+Copy-Item release/$target/zcash-cli.exe     release/wininstaller/
 
 Get-Content src/scripts/zec-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/zec-qt-wallet.wxs