From 4fe025dd9ac848ceae0631ace973002266660a9f Mon Sep 17 00:00:00 2001
From: Predrag Manojlovic <pedjaman@gmail.com>
Date: Fri, 24 Mar 2017 18:02:44 +0100
Subject: [PATCH] Installers: All: Fixed data paths. OSX: Fixed uninstaller

---
 .../IgaunaApp-Linux.xml                       | 26 ++------------
 .../BitRock Installer Files/IgaunaApp-OSX.xml | 34 ++++---------------
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml
index 3d7e1d7..8ead5a8 100755
--- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml	
@@ -1,6 +1,6 @@
 <project>
     <shortName>AgamaApp</shortName>
-    <fullName>Agama</fullName>
+    <fullName>iguana</fullName>
     <version>0.1.6.1e-beta</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
@@ -157,7 +157,7 @@
         </runProgram>
         <deleteFile>
             <explanation>Deleting user data</explanation>
-            <path>${user_home_directory}/.Agama</path>
+            <path>${user_home_directory}/.iguana</path>
             <progressText>Deleting user data</progressText>
             <ruleList>
                 <compareValues>
@@ -199,28 +199,6 @@
                 </compareValues>
             </ruleList>
         </deleteFile>
-        <deleteFile>
-            <explanation>Deleting user settngs</explanation>
-            <path>${user_home_directory}/.config/Agama</path>
-            <progressText>Deleting user settngs</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>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
-                </compareValues>
-            </ruleList>
-        </deleteFile>
         <exit>
             <explanation>Uninstalled</explanation>
             <progressText>Uninstalled</progressText>
diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml
index 55e7d7f..2722341 100755
--- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
+++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml	
@@ -1,6 +1,6 @@
 <project>
     <shortName>AgamaApp</shortName>
-    <fullName>Agama</fullName>
+    <fullName>iguana</fullName>
     <version>0.1.6.0e-beta</version>
     <licenseFile>../../LICENSE</licenseFile>
     <leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
@@ -84,8 +84,8 @@
     </preInstallationActionList>
     <readyToInstallActionList>
         <runProgram>
-            <program>${oldInstalldir}/${uninstallerName}</program>
-            <programArguments></programArguments>
+            <program>open</program>
+            <programArguments>${oldInstalldir}/Agama.app/${uninstallerName}.app</programArguments>
             <ruleList>
                 <compareValues>
                     <logic>equals</logic>
@@ -96,7 +96,7 @@
         </runProgram>
         <deleteFile>
             <explanation>Deleting user data</explanation>
-            <path>${user_home_directory}/Library/Application Support/Agama</path>
+            <path>${user_home_directory}/Library/Application Support/Iguana</path>
             <progressText>Deleting user data</progressText>
             <ruleList>
                 <compareValues>
@@ -138,28 +138,6 @@
                 </compareValues>
             </ruleList>
         </deleteFile>
-        <deleteFile>
-            <explanation>Deleting user settngs</explanation>
-            <path>${user_home_directory}/Library/Application Support/Agama</path>
-            <progressText>Deleting user settngs</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>${keep_settings_and_userdata}</value1>
-                    <value2>0</value2>
-                </compareValues>
-            </ruleList>
-        </deleteFile>
         <exit>
             <explanation>Uninstalled</explanation>
             <progressText>Uninstalled</progressText>
@@ -254,8 +232,8 @@
     <enableTimestamp>1</enableTimestamp>
     <requireInstallationByRootUser>1</requireInstallationByRootUser>
     <saveRelativePaths>1</saveRelativePaths>
-    <uninstallerDirectory>${installdir}/Agama/</uninstallerDirectory>
-    <uninstallerName>Uninstall-Agama.app</uninstallerName>
+    <uninstallerDirectory>${installdir}/Agama.app/</uninstallerDirectory>
+    <uninstallerName>Uninstall-Agama</uninstallerName>
     <vendor>SuperNETOrg</vendor>
     <finalPageActionList>
         <runProgram>