lukechilds
/
Agama
mirror of https://github.com/lukechilds/Agama.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #64 from pedjaman/master 

Installers: Various fixes
all-modes
Satinder Grewal 8 years ago
committed by GitHub
parent
7a745d0cda 4fe025dd9a
commit
b07857aed8
3 changed files with 22 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      assets/BitRock Installer Files/IgaunaApp-Linux.xml
  2. 38
      assets/BitRock Installer Files/IgaunaApp-OSX.xml
  3. 20
      assets/BitRock Installer Files/IgaunaApp-Win.xml

30
assets/BitRock Installer Files/IgaunaApp-Linux.xml
View File

@ -199,28 +199,6 @@
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting user settngs</explanation>
<path>${user_home_directory}/.config/Iguana</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>
@ -385,8 +363,8 @@
<title>Instalation type</title>
<description>Existing instalation is detected</description>
<explanation>Existing instalation is detected</explanation>
<value>reinstall</value>
<default>reinstall</default>
<value>uninstall</value>
<default>uninstall</default>
<parameterList>
<parameterGroup>
<name>uninstall</name>
@ -397,8 +375,8 @@
<parameterList>
<booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
<explanation></explanation>
<value>1</value>
<default>1</default>
<value>0</value>
<default>0</default>
</booleanParameter>
</parameterList>
</parameterGroup>

38
assets/BitRock Installer Files/IgaunaApp-OSX.xml
View File

@ -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>
@ -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>
@ -295,8 +273,8 @@
<title>Instalation type</title>
<description>Existing instalation is detected</description>
<explanation>Existing instalation is detected</explanation>
<value>reinstall</value>
<default>reinstall</default>
<value>uninstall</value>
<default>uninstall</default>
<parameterList>
<parameterGroup>
<name>uninstall</name>
@ -307,8 +285,8 @@
<parameterList>
<booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
<explanation></explanation>
<value>1</value>
<default>1</default>
<value>0</value>
<default>0</default>
</booleanParameter>
</parameterList>
</parameterGroup>

20
assets/BitRock Installer Files/IgaunaApp-Win.xml
View File

@ -1,6 +1,6 @@
<project>
<shortName>AgamaApp</shortName>
<fullName>iguana</fullName>
<fullName>Agama</fullName>
<version>0.1.6e-beta</version>
<licenseFile>../../LICENSE</licenseFile>
<leftImage>../installer_imgs/Agama_installer_wizard_image.png</leftImage>
@ -197,7 +197,7 @@
</runProgram>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${windows_folder_appdata}/Iguana</path>
<path>${windows_folder_appdata}/Agama</path>
<progressText>Deleting user data</progressText>
<ruleList>
<compareValues>
@ -238,7 +238,7 @@
<actionList>
<httpGet>
<abortOnError>0</abortOnError>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon</explanation>
<filename>${system_temp_directory}/vc_redist.x64.exe</filename>
<progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
<showMessageOnError>0</showMessageOnError>
@ -254,7 +254,7 @@
</showProgressDialog>
<runProgram>
<abortOnError>0</abortOnError>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon</explanation>
<program>${system_temp_directory}/vc_redist.x64.exe</program>
<programArguments>/install /passive</programArguments>
<progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
@ -265,7 +265,7 @@
<actionList>
<httpGet>
<abortOnError>0</abortOnError>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon</explanation>
<filename>${system_temp_directory}/vc_redist.x86.exe</filename>
<progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
<showMessageOnError>0</showMessageOnError>
@ -281,7 +281,7 @@
</showProgressDialog>
<runProgram>
<abortOnError>0</abortOnError>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for iguana daemon</explanation>
<explanation>Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon</explanation>
<program>${system_temp_directory}/vc_redist.x86.exe</program>
<programArguments>/install /passive</programArguments>
<progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
@ -450,8 +450,8 @@
<title>Instalation type</title>
<description>Existing instalation is detected</description>
<explanation>Existing instalation is detected</explanation>
<value>reinstall</value>
<default>reinstall</default>
<value>uninstall</value>
<default>uninstall</default>
<parameterList>
<parameterGroup>
<name>uninstall</name>
@ -462,8 +462,8 @@
<parameterList>
<booleanParameter name="keep_settings_and_userdata" description="Keep setting and user data" displayStyle="checkbox-left">
<explanation></explanation>
<value>1</value>
<default>1</default>
<value>0</value>
<default>0</default>
</booleanParameter>
</parameterList>
</parameterGroup>

Write Preview
Loading…
Cancel
Save