From 167f99cf4dbb54e80f1c05f50c2b8636bd70f354 Mon Sep 17 00:00:00 2001
From: Predrag Manojlovic <pedjaman@gmail.com>
Date: Sun, 26 Mar 2017 00:16:27 +0100
Subject: [PATCH] Installers: All: Added separate options to delete suers data
 and Zcash params

---
 .../IgaunaApp-Linux.xml                       | 21 ++++++-----
 .../BitRock Installer Files/IgaunaApp-OSX.xml | 15 +++++---
 .../BitRock Installer Files/IgaunaApp-Win.xml | 35 ++++++++++++++++---
 3 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml
index 8ead5a8..932150d 100755
--- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml	
@@ -172,15 +172,15 @@
                 </compareValues>
                 <compareValues>
                     <logic>equals</logic>
-                    <value1>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
+                    <value1>${delete_user_data}</value1>
+                    <value2>1</value2>
                 </compareValues>
             </ruleList>
         </deleteFile>
         <deleteFile>
-            <explanation>Deleting zcache-params</explanation>
-            <path>${user_home_directory}/.zcache-params</path>
-            <progressText>Deleting zcache-params</progressText>
+            <explanation>Deleting zcash params</explanation>
+            <path>${user_home_directory}/.zcash-params</path>
+            <progressText>Deleting zcash-params</progressText>
             <ruleList>
                 <compareValues>
                     <logic>equals</logic>
@@ -194,8 +194,8 @@
                 </compareValues>
                 <compareValues>
                     <logic>equals</logic>
-                    <value1>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
+                    <value1>${delete_zcash_params}</value1>
+                    <value2>1</value2>
                 </compareValues>
             </ruleList>
         </deleteFile>
@@ -373,7 +373,12 @@
                     <value></value>
                     <default></default>
                     <parameterList>
-                        <booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
+                        <booleanParameter name="delete_user_data" description="Delete user data" displayStyle="checkbox-left">
+                            <explanation></explanation>
+                            <value>0</value>
+                            <default>0</default>
+                        </booleanParameter>
+                        <booleanParameter name="delete_zcash_params" description="Delete Zcash params" displayStyle="checkbox-left">
                             <explanation></explanation>
                             <value>0</value>
                             <default>0</default>
diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml
index 9723fb8..5154a57 100755
--- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
@@ -111,8 +111,8 @@
                 </compareValues>
                 <compareValues>
                     <logic>equals</logic>
-                    <value1>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
+                    <value1>${delete_user_data}</value1>
+                    <value2>1</value2>
                 </compareValues>
             </ruleList>
         </deleteFile>
@@ -133,8 +133,8 @@
                 </compareValues>
                 <compareValues>
                     <logic>equals</logic>
-                    <value1>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
+                    <value1>${delete_zcash_params}</value1>
+                    <value2>1</value2>
                 </compareValues>
             </ruleList>
         </deleteFile>
@@ -283,7 +283,12 @@
                     <value></value>
                     <default></default>
                     <parameterList>
-                        <booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
+                        <booleanParameter name="delete_user_data" description="Delete user data" displayStyle="checkbox-left">
+                            <explanation></explanation>
+                            <value>0</value>
+                            <default>0</default>
+                        </booleanParameter>
+                        <booleanParameter name="delete_zcash_params" description="Delete Zcash params" displayStyle="checkbox-left">
                             <explanation></explanation>
                             <value>0</value>
                             <default>0</default>
diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml
index be85613..127034a 100755
--- a/assets/BitRock Installer Files/IgaunaApp-Win.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml	
@@ -1,6 +1,6 @@
 <project>
     <shortName>AgamaApp</shortName>
-    <fullName>Agama</fullName>
+    <fullName>iguana</fullName>
     <version>0.1.6e-beta</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
@@ -212,8 +212,30 @@
                 </compareValues>
                 <compareValues>
                     <logic>equals</logic>
-                    <value1>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
+                    <value1>${delete_user_data}</value1>
+                    <value2>1</value2>
+                </compareValues>
+            </ruleList>
+        </deleteFile>
+        <deleteFile>
+            <explanation>Deleting zcash params</explanation>
+            <path>${windows_folder_appdata}/ZcashParams/</path>
+            <progressText>Deleting zcash-params</progressText>
+            <ruleList>
+                <compareValues>
+                    <logic>equals</logic>
+                    <value1>${previous_installation_exists}</value1>
+                    <value2>1</value2>
+                </compareValues>
+                <compareValues>
+                    <logic>equals</logic>
+                    <value1>${installation_type}</value1>
+                    <value2>uninstall</value2>
+                </compareValues>
+                <compareValues>
+                    <logic>equals</logic>
+                    <value1>${delete_zcash_params}</value1>
+                    <value2>1</value2>
                 </compareValues>
             </ruleList>
         </deleteFile>
@@ -460,7 +482,12 @@
                     <value></value>
                     <default></default>
                     <parameterList>
-                        <booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
+                        <booleanParameter name="delete_user_data" description="Delete user data" displayStyle="checkbox-left">
+                            <explanation></explanation>
+                            <value>0</value>
+                            <default>0</default>
+                        </booleanParameter>
+                        <booleanParameter name="delete_zcash_params" description="Delete Zcash params" displayStyle="checkbox-left">
                             <explanation></explanation>
                             <value>0</value>
                             <default>0</default>