From e077a4e13b7ff8ba693795d2f6a58a586152047e Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Sun, 25 Nov 2018 13:35:31 -0800
Subject: [PATCH] Finalize installer names

---
 src/scripts/dobuild.ps1        | 20 +++++++++++---------
 src/scripts/mkrelease.sh       | 16 ++++++++--------
 src/scripts/mkwininstaller.ps1 |  2 +-
 src/settings.ui                |  4 ++--
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/scripts/dobuild.ps1 b/src/scripts/dobuild.ps1
index 1003f51..f0c229c 100644
--- a/src/scripts/dobuild.ps1
+++ b/src/scripts/dobuild.ps1
@@ -2,23 +2,25 @@
 param (
     [Parameter(Mandatory=$true)][string]$version,
     [Parameter(Mandatory=$true)][string]$prev,
-    [Parameter(Mandatory=$true)][string]$server,
-    [Parameter(Mandatory=$true)][string]$macserver
+    [Parameter(Mandatory=$true)][string]$server
+#    [Parameter(Mandatory=$true)][string]$macserver
 )
 
 Write-Host "[Initializing]"
 Remove-Item -Force -ErrorAction Ignore ./artifacts/linux-zec-qt-wallet-v$version.tar.gz
-Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-zec-qt-wallet-v$version.zip
+Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-binaries-zec-qt-wallet-v$version.zip
 Remove-Item -Force -ErrorAction Ignore ./artifacts/zec-qt-wallet-v$version.deb
-Remove-Item -Force -ErrorAction Ignore ./artifacts/zec-qt-wallet-v$version.msi
+Remove-Item -Force -ErrorAction Ignore ./artifacts/Windows-installer-zec-qt-wallet-v$version.msi
 Remove-Item -Force -ErrorAction Ignore ./artifacts/macOS-zec-qt-wallet-v$version.dmg
 
 Remove-Item -Recurse -Force -ErrorAction Ignore ./bin
 Remove-Item -Recurse -Force -ErrorAction Ignore ./debug
 Remove-Item -Recurse -Force -ErrorAction Ignore ./release
 
-# Create the version.h file
+# Create the version.h file and update README version number
 Write-Output "#define APP_VERSION `"$version`"" > src/version.h
+Get-Content README.md | Foreach-Object { $_ -replace "$prev", "$version" } | Out-File README-new.md
+Move-Item -Force README-new.md README.md
 Write-Host ""
 
 
@@ -69,11 +71,11 @@ Write-Host "[OK]"
 
 # Finally, test to make sure all files exist
 Write-Host -NoNewline "Checking Build........."
-if (! (Test-Path ./artifacts/linux-zec-qt-wallet-v$version.tar.gz) -or
-    ! (Test-Path ./artifacts/Windows-zec-qt-wallet-v$version.zip) -or
-    ! (Test-Path ./artifacts/zec-qt-wallet-v$version.deb) -or
+if (! (Test-Path ./artifacts/linux-binaries-zec-qt-wallet-v$version.tar.gz) -or
+    ! (Test-Path ./artifacts/linux-deb-zec-qt-wallet-v$version.deb) -or
+    ! (Test-Path ./artifacts/Windows-binaries-zec-qt-wallet-v$version.zip) -or
 #    ! (Test-Path ./artifacts/macOS-zec-qt-wallet-v$version.dmg) -or 
-    ! (Test-Path ./artifacts/zec-qt-wallet-v$version.msi) ) {
+    ! (Test-Path ./artifacts/Windows-installer-zec-qt-wallet-v$version.msi) ) {
         Write-Host "[Error]"
         exit 1;
     }
diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh
index 3c43e54..c2d86dd 100755
--- a/src/scripts/mkrelease.sh
+++ b/src/scripts/mkrelease.sh
@@ -90,14 +90,14 @@ 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
+cp bin/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz
 echo "[OK]"
 
 
-if [ -f artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then
+if [ -f artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz ] ; then
     echo -n "Package contents......."
     # Test if the package is built OK
-    if tar tf "artifacts/linux-zec-qt-wallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then 
+    if tar tf "artifacts/linux-binaries-zec-qt-wallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then 
         echo "[OK]"
     else
         echo "[ERROR]"
@@ -126,7 +126,7 @@ mkdir -p $debdir/usr/share/applications
 cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop
 
 dpkg-deb --build $debdir >/dev/null
-cp $debdir.deb artifacts/
+cp $debdir.deb artifacts/linux-deb-zec-qt-wallet-v$APP_VERSION.deb
 echo "[OK]"
 
 
@@ -175,15 +175,15 @@ cp $ZCASH_DIR/artifacts/zcashd.exe release/zec-qt-wallet-v$APP_VERSION > /dev/nu
 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 
-cd release && zip -r Windows-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
+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-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/
+cp release/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/
 echo "[OK]"
 
-if [ -f artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then
+if [ -f artifacts/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip ] ; then
     echo -n "Package contents......."
-    if unzip -l "artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then 
+    if unzip -l "artifacts/Windows-binaries-zec-qt-wallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then 
         echo "[OK]"
     else
         echo "[ERROR]"
diff --git a/src/scripts/mkwininstaller.ps1 b/src/scripts/mkwininstaller.ps1
index 2a157d9..09845ed 100644
--- a/src/scripts/mkwininstaller.ps1
+++ b/src/scripts/mkwininstaller.ps1
@@ -26,4 +26,4 @@ if (!$?) {
 }
 
 New-Item artifacts -itemtype directory -Force | Out-Null
-Copy-Item release/wininstaller/zec-qt-wallet.msi ./artifacts/$target.msi
\ No newline at end of file
+Copy-Item release/wininstaller/zec-qt-wallet.msi ./artifacts/Windows-installer-$target.msi
\ No newline at end of file
diff --git a/src/settings.ui b/src/settings.ui
index d5a540b..d3d633e 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -216,7 +216,7 @@
        <item row="7" column="0" colspan="2">
         <widget class="QLabel" name="label_7">
          <property name="text">
-          <string>Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded Sapling address instead. Check this option to increase your privacy.</string>
+          <string>Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -226,7 +226,7 @@
        <item row="6" column="0" colspan="2">
         <widget class="QCheckBox" name="chkAutoShield">
          <property name="text">
-          <string>Shield change from t-Addresses to your Sapling addresses</string>
+          <string>Shield change from t-Addresses to your sapling address</string>
          </property>
         </widget>
        </item>