From ce3c163bc5da57c393bdb466c433554136a680ed Mon Sep 17 00:00:00 2001
From: Satinder Grewal <grewal.satinder@gmail.com>
Date: Wed, 25 Jan 2017 14:23:17 +1300
Subject: [PATCH] Installer XML files updated

---
 .../BitRock Installer Files/IgaunaApp-OSX.xml | 52 ++++++++++++++++++-
 .../BitRock Installer Files/IgaunaApp-Win.xml | 32 ++++++++++--
 2 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml
index ca6f9eb..8a0a755 100644
--- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
@@ -1,7 +1,7 @@
 <project>
-    <shortName>IgaunaApp</shortName>
+    <shortName>IguanaApp</shortName>
     <fullName>iguana</fullName>
-    <version>0.1-beta-test</version>
+    <version>0.1.1-beta-test</version>
     <licenseFile>/Users/satinder/Documents/Github/iguana/LICENSE</licenseFile>
     <leftImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/Iguana_installer_wizard_image.png</leftImage>
     <logoImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/supernet-iguana-logo.png</logoImage>
@@ -47,8 +47,56 @@
             </folderList>
         </component>
     </componentList>
+    <readyToInstallActionList>
+        <createDirectory>
+            <abortOnError>0</abortOnError>
+            <explanation>Creating ZcashParam directory</explanation>
+            <path>${user_home_directory}/Library/Application Support/ZcashParams/</path>
+            <progressText>Creating ZcashParam directory</progressText>
+            <showMessageOnError>0</showMessageOnError>
+        </createDirectory>
+        <showProgressDialog>
+            <title>Downloading files</title>
+            <actionList>
+                <httpGet>
+                    <abortOnError>0</abortOnError>
+                    <explanation>Zcash Params file: sprout-proving.key</explanation>
+                    <filename>${user_home_directory}/Library/Application Support/ZcashParams/sprout-proving.key</filename>
+                    <progressText>Zcash Params file: sprout-proving.key</progressText>
+                    <showMessageOnError>0</showMessageOnError>
+                    <url>https://z.cash/downloads/sprout-proving.key</url>
+                </httpGet>
+            </actionList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${user_home_directory}/Library/Application Support/ZcashParams/sprout-proving.key</path>
+                </fileExists>
+            </ruleList>
+        </showProgressDialog>
+        <showProgressDialog>
+            <title>Downloading files</title>
+            <actionList>
+                <httpGet>
+                    <abortOnError>0</abortOnError>
+                    <explanation>Zcash Params file: sprout-verifying.key</explanation>
+                    <filename>${user_home_directory}/Library/Application Support/ZcashParams/sprout-verifying.key</filename>
+                    <progressText>Zcash Params file: sprout-verifying.key</progressText>
+                    <showMessageOnError>0</showMessageOnError>
+                    <url>https://z.cash/downloads/sprout-verifying.key</url>
+                </httpGet>
+            </actionList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${user_home_directory}/Library/Application Support/ZcashParams/sprout-verifying.key</path>
+                </fileExists>
+            </ruleList>
+        </showProgressDialog>
+    </readyToInstallActionList>
     <compressionAlgorithm>lzham-ultra</compressionAlgorithm>
     <enableRollback>1</enableRollback>
+    <enableSslSupport>1</enableSslSupport>
     <enableTimestamp>1</enableTimestamp>
     <uninstallerDirectory>${installdir}/Iguana/</uninstallerDirectory>
     <uninstallerName>Uninstall-Iguana</uninstallerName>
diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml
index d8c46d1..d336d51 100644
--- a/assets/BitRock Installer Files/IgaunaApp-Win.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml	
@@ -1,7 +1,7 @@
 <project>
     <shortName>IguanaApp</shortName>
     <fullName>iguana</fullName>
-    <version>0.1-beta-test</version>
+    <version>0.1.1-beta-test</version>
     <licenseFile>/Users/satinder/Documents/Github/iguana/LICENSE</licenseFile>
     <leftImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/Iguana_installer_wizard_image.png</leftImage>
     <logoImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/supernet-iguana-logo.png</logoImage>
@@ -173,41 +173,67 @@
             <title>Downloading files</title>
             <actionList>
                 <httpGet>
+                    <abortOnError>0</abortOnError>
                     <explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
-                    <filename>vc_redist.x64.exe</filename>
+                    <filename>${system_temp_directory}/vc_redist.x64.exe</filename>
                     <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+                    <showMessageOnError>0</showMessageOnError>
                     <url>https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe</url>
                 </httpGet>
             </actionList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${system_temp_directory}/vc_redist.x64.exe</path>
+                </fileExists>
+            </ruleList>
         </showProgressDialog>
         <runProgram>
+            <abortOnError>0</abortOnError>
             <explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
             <program>vc_redist.x64.exe</program>
             <programArguments>/install /passive</programArguments>
             <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+            <showMessageOnError>0</showMessageOnError>
         </runProgram>
         <deleteFile>
+            <abortOnError>0</abortOnError>
             <path>vc_redist.x64.exe</path>
+            <showMessageOnError>0</showMessageOnError>
         </deleteFile>
         <showProgressDialog>
+            <abortOnError>0</abortOnError>
+            <showMessageOnError>0</showMessageOnError>
             <title>Downloading files</title>
             <actionList>
                 <httpGet>
+                    <abortOnError>0</abortOnError>
                     <explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
-                    <filename>vc_redist.x86.exe</filename>
+                    <filename>${system_temp_directory}/vc_redist.x86.exe</filename>
                     <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+                    <showMessageOnError>0</showMessageOnError>
                     <url>https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe</url>
                 </httpGet>
             </actionList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${system_temp_directory}/vc_redist.x64.exe</path>
+                </fileExists>
+            </ruleList>
         </showProgressDialog>
         <runProgram>
+            <abortOnError>0</abortOnError>
             <explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
             <program>vc_redist.x86.exe</program>
             <programArguments>/install /passive</programArguments>
             <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+            <showMessageOnError>0</showMessageOnError>
         </runProgram>
         <deleteFile>
+            <abortOnError>0</abortOnError>
             <path>vc_redist.x86.exe</path>
+            <showMessageOnError>0</showMessageOnError>
         </deleteFile>
     </readyToInstallActionList>
     <postInstallationActionList>