From e68c312e0acdeb991e55d81bc46785095fef957b Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Mon, 20 Mar 2017 18:28:35 +0100 Subject: [PATCH 1/7] Win: Bugfix: Previous isntallation detection failing when different versions --- assets/BitRock Installer Files/IgaunaApp-Win.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index 5691a71..d88deb2 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -171,8 +171,8 @@ - HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${product_fullname} ${product_version} - UninstallString + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path uninstaller_path @@ -289,6 +289,12 @@ + + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path + REG_SZ + ${installdir}/${uninstallerName}.exe + @@ -340,6 +346,12 @@ + + + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path + + lzham-ultra 0 1 From 4775c53c6b2add266c3fa6127e47d6ea63a34f00 Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Tue, 21 Mar 2017 19:29:28 +0100 Subject: [PATCH 2/7] Linux: Added shortcut to meny Office --- assets/BitRock Installer Files/IgaunaApp-Linux.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml index f9ec9fd..b2b76d4 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml @@ -296,11 +296,21 @@ /bin/Iguana ${installdir}/Iguana + + /root/Desktop/Iguana Desktop.desktop + Categories +
Desktop Entry
+ Office; +
${user_home_directory}/Desktop/Iguana Desktop.desktop users nobody + + /usr/share/applications/Iguana Desktop.desktop + /root/Desktop/Iguana Desktop.desktop + From 60e51cb25b2485a579edb2d0378d38e01a1fa128 Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Tue, 21 Mar 2017 19:33:30 +0100 Subject: [PATCH 3/7] All: changed bytes to KB --- assets/BitRock Installer Files/IgaunaApp-Linux.xml | 2 +- assets/BitRock Installer Files/IgaunaApp-OSX.xml | 2 +- assets/BitRock Installer Files/IgaunaApp-Win.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml index b2b76d4..3f2dbca 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml @@ -12,7 +12,7 @@ default ${project.shortName} 0 - All application files. Required size: ${project.component(default).requiredSize} bytes + All application files. Required size: ${project.component(default).requiredSize} KB 1 1 diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml index 3e8759b..a8fde5c 100644 --- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml +++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml @@ -12,7 +12,7 @@ default ${project.shortName} 0 - All application files. Required size: ${project.component(default).requiredSize} bytes + All application files. Required size: ${project.component(default).requiredSize} KB 1 1 diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index d88deb2..1c1b1c6 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -12,7 +12,7 @@ default ${project.shortName} 0 - All application files. Required size: ${project.component(default).requiredSize} bytes + All application files. Required size: ${project.component(default).requiredSize} KB 1 1 From f5e8edf4693e00984ab8dfe2149a673aa8a7b069 Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Fri, 24 Mar 2017 15:43:43 +0100 Subject: [PATCH 4/7] Installers: All: Changed default actions when previous installer is detected. --- assets/BitRock Installer Files/IgaunaApp-Linux.xml | 8 ++++---- assets/BitRock Installer Files/IgaunaApp-OSX.xml | 8 ++++---- assets/BitRock Installer Files/IgaunaApp-Win.xml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml index 0a0fe2a..fd4162e 100755 --- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml @@ -385,8 +385,8 @@ Instalation type Existing instalation is detected Existing instalation is detected - reinstall - reinstall + uninstall + uninstall uninstall @@ -397,8 +397,8 @@ - 1 - 1 + 0 + 0 diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml index 6b6e958..84f61ad 100755 --- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml +++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml @@ -295,8 +295,8 @@ Instalation type Existing instalation is detected Existing instalation is detected - reinstall - reinstall + uninstall + uninstall uninstall @@ -307,8 +307,8 @@ - 1 - 1 + 0 + 0 diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index 73ec0da..1efd3b4 100755 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -450,8 +450,8 @@ Instalation type Existing instalation is detected Existing instalation is detected - reinstall - reinstall + uninstall + uninstall uninstall @@ -462,8 +462,8 @@ - 1 - 1 + 0 + 0 From 6ac380fdf36cffd95fa5f370946d555ff9a4ade9 Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Fri, 24 Mar 2017 15:47:58 +0100 Subject: [PATCH 5/7] Installers: All: Changed orphaned name iguana to Agama in installer --- assets/BitRock Installer Files/IgaunaApp-Linux.xml | 6 +++--- assets/BitRock Installer Files/IgaunaApp-Win.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml index fd4162e..3d7e1d7 100755 --- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml @@ -1,6 +1,6 @@ AgamaApp - iguana + Agama 0.1.6.1e-beta ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png @@ -157,7 +157,7 @@ Deleting user data - ${user_home_directory}/.iguana + ${user_home_directory}/.Agama Deleting user data @@ -201,7 +201,7 @@ Deleting user settngs - ${user_home_directory}/.config/Iguana + ${user_home_directory}/.config/Agama Deleting user settngs diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index 1efd3b4..be85613 100755 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -1,6 +1,6 @@ AgamaApp - iguana + Agama 0.1.6e-beta ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png @@ -197,7 +197,7 @@ Deleting user data - ${windows_folder_appdata}/Iguana + ${windows_folder_appdata}/Agama Deleting user data @@ -238,7 +238,7 @@ 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon ${system_temp_directory}/vc_redist.x64.exe Downloading Visual C++ Redistributable for Visual Studio 2015 0 @@ -254,7 +254,7 @@ 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon ${system_temp_directory}/vc_redist.x64.exe /install /passive Downloading Visual C++ Redistributable for Visual Studio 2015 @@ -265,7 +265,7 @@ 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon ${system_temp_directory}/vc_redist.x86.exe Downloading Visual C++ Redistributable for Visual Studio 2015 0 @@ -281,7 +281,7 @@ 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon + Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon ${system_temp_directory}/vc_redist.x86.exe /install /passive Downloading Visual C++ Redistributable for Visual Studio 2015 From c9999e9201e0c0b6174847d5bdd0a5c02d7b5459 Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Fri, 24 Mar 2017 15:48:16 +0100 Subject: [PATCH 6/7] Installers: All: Changed orphaned name iguana to Agama in installer --- assets/BitRock Installer Files/IgaunaApp-OSX.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml index 84f61ad..55e7d7f 100755 --- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml +++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml @@ -1,6 +1,6 @@ AgamaApp - iguana + Agama 0.1.6.0e-beta ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png @@ -96,7 +96,7 @@ Deleting user data - ${user_home_directory}/Library/Application Support/Iguana + ${user_home_directory}/Library/Application Support/Agama Deleting user data From 4fe025dd9ac848ceae0631ace973002266660a9f Mon Sep 17 00:00:00 2001 From: Predrag Manojlovic Date: Fri, 24 Mar 2017 18:02:44 +0100 Subject: [PATCH 7/7] 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 @@ AgamaApp - Agama + iguana 0.1.6.1e-beta ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png @@ -157,7 +157,7 @@ Deleting user data - ${user_home_directory}/.Agama + ${user_home_directory}/.iguana Deleting user data @@ -199,28 +199,6 @@ - - Deleting user settngs - ${user_home_directory}/.config/Agama - Deleting user settngs - - - equals - ${previous_installation_exists} - 1 - - - equals - ${installation_type} - uninstall - - - equals - ${keep_settings_and_userdata} - 0 - - - Uninstalled Uninstalled 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 @@ AgamaApp - Agama + iguana 0.1.6.0e-beta ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png @@ -84,8 +84,8 @@
- ${oldInstalldir}/${uninstallerName} - + open + ${oldInstalldir}/Agama.app/${uninstallerName}.app equals @@ -96,7 +96,7 @@ Deleting user data - ${user_home_directory}/Library/Application Support/Agama + ${user_home_directory}/Library/Application Support/Iguana Deleting user data @@ -138,28 +138,6 @@ - - Deleting user settngs - ${user_home_directory}/Library/Application Support/Agama - Deleting user settngs - - - equals - ${previous_installation_exists} - 1 - - - equals - ${installation_type} - uninstall - - - equals - ${keep_settings_and_userdata} - 0 - - - Uninstalled Uninstalled @@ -254,8 +232,8 @@ 1 1 1 - ${installdir}/Agama/ - Uninstall-Agama.app + ${installdir}/Agama.app/ + Uninstall-Agama SuperNETOrg