diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index ce068f1..25f0804 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -1,7 +1,7 @@ IguanaApp iguana - 0.1.4-beta + 0.1.5.5e-beta ../../LICENSE ../installer_imgs/Iguana_installer_wizard_image.png ../installer_imgs/supernet-iguana-logo.png @@ -24,10 +24,10 @@ all 0 0 - ${WinInstallDir}/Iguana.exe + ${installdir}/Iguana.exe - ${WinInstallDir}/ + ${installdir}/ @@ -46,10 +46,10 @@ all 0 0 - ${WinInstallDir}/${uninstallerName}.exe + ${installdir}/${uninstallerName}.exe - ${WinInstallDir} + ${installdir} @@ -61,7 +61,7 @@ Program Files - ${WinInstallDir} + ${installdir} programfileswindows windows @@ -150,43 +150,88 @@ Iguana App 0 0 - ${WinInstallDir}/Iguana.exe + ${installdir}/Iguana.exe - ${WinInstallDir}/ + ${installdir}/ Right Click and Run As Administrator DLL Fix (Run As Administrator) 0 0 - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/CopyWinDepsFiles.bat + ${installdir}/resources/app/windeps/CopyWinDepsFiles.bat - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/ + ${installdir}/resources/app/windeps/ - - + HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${product_fullname} ${product_version} UninstallString uninstaller_path + + previous_installation_exists + 1 + + + + + + ${uninstaller_path} - --mode unattended + - - exists - ${uninstaller_path} - + + equals + ${previous_installation_exists} + 1 + - - + + Deleting user data + ${windows_folder_appdata}/Iguana + Deleting user data + + + equals + ${previous_installation_exists} + 1 + + + equals + ${installation_type} + uninstall + + + equals + ${keep_settings_and_userdata} + 0 + + + + + Uninstalled + Uninstalled + + + equals + ${previous_installation_exists} + 1 + + + equals + ${installation_type} + uninstall + + + Downloading files @@ -248,13 +293,13 @@ C:\Windows\System32\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x86/ucrtbased.dll + ${installdir}/resources/app/windeps/x86/ucrtbased.dll Copying ReqCopying Required DLL filesuired DLL files C:\Windows\System32\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x86/vcruntime140d.dll + ${installdir}/resources/app/windeps/x86/vcruntime140d.dll Copying ReqCopying Required DLL filesuired DLL files @@ -267,25 +312,25 @@ C:\Windows\System32\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x64/ucrtbased.dll + ${installdir}/resources/app/windeps/x64/ucrtbased.dll Copying ReqCopying Required DLL filesuired DLL files C:\Windows\System32\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x64/vcruntime140d.dll + ${installdir}/resources/app/windeps/x64/vcruntime140d.dll Copying ReqCopying Required DLL filesuired DLL files C:\Windows\SysWOW64\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x86/ucrtbased.dll + ${installdir}/resources/app/windeps/x86/ucrtbased.dll Copying ReqCopying Required DLL filesuired DLL files C:\Windows\SysWOW64\ Copying ReqCopying Required DLL filesuired DLL files - ${windows_folder_profile}/${product_shortname}/resources/app/windeps/x86/vcruntime140d.dll + ${installdir}/resources/app/windeps/x86/vcruntime140d.dll Copying ReqCopying Required DLL filesuired DLL files @@ -304,7 +349,7 @@ 1 - ${windows_folder_profile}/${product_shortname}/Iguana.exe + ${installdir}/Iguana.exe & Do you want to launch ${project.fullName} now? @@ -317,24 +362,47 @@ ${platform_install_prefix}/${product_shortname} 0 - 0 prefix 1 0 30 - - WinInstallDir - Installer.Parameter.installdir.description - Installer.Parameter.installdir.explanation - - ${windows_folder_profile}/${product_shortname} - 0 - 0 - 0 - 0 - 30 - + + installation_type + Instalation type + Existing instalation is detected + Existing instalation is detected + reinstall + reinstall + + + uninstall + Uninstall + Uninstall + + + + + + 1 + 1 + + + + + Re-install + + + + + + + equals + ${previous_installation_exists} + 1 + + + diff --git a/assets/bin/osx/komodo-cli b/assets/bin/osx/komodo-cli index 4bc3522..85a25b0 100755 Binary files a/assets/bin/osx/komodo-cli and b/assets/bin/osx/komodo-cli differ diff --git a/assets/bin/osx/komodod b/assets/bin/osx/komodod index 14678f3..3c60bcb 100755 Binary files a/assets/bin/osx/komodod and b/assets/bin/osx/komodod differ diff --git a/assets/bin/win64/komodo-cli.exe b/assets/bin/win64/komodo-cli.exe index 2df3592..9652926 100755 Binary files a/assets/bin/win64/komodo-cli.exe and b/assets/bin/win64/komodo-cli.exe differ diff --git a/assets/bin/win64/komodod.exe b/assets/bin/win64/komodod.exe index 0502444..a41bfc6 100755 Binary files a/assets/bin/win64/komodod.exe and b/assets/bin/win64/komodod.exe differ diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index 6797eb2..7065162 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit 6797eb26587576f1648914c0c1be9061c3f022d5 +Subproject commit 7065162a32fc1edd8995c9e724c4e56f8132683e