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

Merge branch 'master' of https://github.com/SuperNETorg/Agama

all-modes
Petr Balashov 7 years ago
parent
3fd093041e 8d23f43ff6
commit
ed2a40e01f
5 changed files with 181 additions and 34 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. 74
      assets/BitRock Installer Files/IgaunaApp-Linux.xml
  2. 38
      assets/BitRock Installer Files/IgaunaApp-OSX.xml
  3. 36
      assets/BitRock Installer Files/IgaunaApp-Win.xml
  4. 49
      binary_artifacts.sh
  5. 18
      routes/shepherd.js

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

@ -110,11 +110,22 @@
</component>
</componentList>
<preInstallationActionList>
<setInstallerVariableFromScriptOutput>
<exec>xdg-user-dir</exec>
<execArgs>DESKTOP</execArgs>
<name>desktopDir</name>
<ruleList>
<programTest>
<condition>is_in_path</condition>
<name>xdg-user-dir</name>
</programTest>
</ruleList>
</setInstallerVariableFromScriptOutput>
<setInstallerVariable>
<name>previous_installation_exists</name>
<value>1</value>
<ruleList>
<fileTest condition="exists" path="/etc/${project.vendor}-${project.shortName}.ini"/>
<fileTest condition="exists" path="${user_home_directory}/.${project.vendor}-${project.shortName}.ini"/>
</ruleList>
</setInstallerVariable>
@ -125,7 +136,7 @@
<actionList>
<setInstallerVariable name="${variable}" value=""/>
<iniFileGet>
<file>/etc/${project.vendor}-${project.shortName}.ini</file>
<file>${user_home_directory}/.${project.vendor}-${project.shortName}.ini</file>
<key>${name}</key>
<section>details</section>
<variable>${variable}</variable>
@ -177,6 +188,28 @@
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/.config/Agama</path>
<progressText>Deleting user data</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_user_data}</value1>
<value2>1</value2>
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting zcash params</explanation>
<path>${user_home_directory}/.zcash-params</path>
@ -215,6 +248,16 @@
</compareValues>
</ruleList>
</exit>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/.iguana/shepherd</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/.iguana/config.json</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<createDirectory>
<abortOnError>0</abortOnError>
<explanation>Creating ZcashParam directory</explanation>
@ -279,23 +322,18 @@
<postInstallationActionList>
<createSymLink>
<abortOnError>0</abortOnError>
<linkName>/bin/Agama</linkName>
<linkName>${user_home_directory}/bin/Agama</linkName>
<target>${installdir}/Agama</target>
</createSymLink>
<iniFileSet>
<file>${user_home_directory}/Desktop/Agama Desktop.desktop</file>
<file>${desktopDir}/Agama Desktop.desktop</file>
<key>Categories</key>
<section>Desktop Entry</section>
<value>Office;</value>
</iniFileSet>
<changeOwnerAndGroup>
<files>${user_home_directory}/Desktop/Agama Desktop.desktop</files>
<group>users</group>
<owner>nobody</owner>
</changeOwnerAndGroup>
<copyFile>
<destination>/usr/share/applications/Agama Desktop.desktop</destination>
<origin>${user_home_directory}/Desktop/Agama Desktop.desktop</origin>
<destination>${user_home_directory}/.local/share/applications/Agama Desktop.desktop</destination>
<origin>${desktopDir}/Agama Desktop.desktop</origin>
</copyFile>
<!-- Store values of current installer in etc folder so we can find for uninstal -->
@ -304,7 +342,7 @@
<variables>name variable</variables>
<actionList>
<iniFileSet>
<file>/etc/${project.vendor}-${project.shortName}.ini</file>
<file>${user_home_directory}/.${project.vendor}-${project.shortName}.ini</file>
<key>${name}</key>
<section>details</section>
<value>${variable}</value>
@ -314,7 +352,7 @@
<platformTest negate="1" type="windows"/>
</ruleList>
</foreach>
<addFilesToUninstaller files="/etc/${project.vendor}-${project.shortName}.ini"/>
<addFilesToUninstaller files="${user_home_directory}/.${project.vendor}-${project.shortName}.ini"/>
</postInstallationActionList>
<postUninstallationActionList>
<deleteFile>
@ -328,16 +366,14 @@
<enableRollback>0</enableRollback>
<enableSslSupport>1</enableSslSupport>
<enableTimestamp>1</enableTimestamp>
<requireInstallationByRootUser>1</requireInstallationByRootUser>
<saveRelativePaths>1</saveRelativePaths>
<uninstallerName>Uninstall-Agama</uninstallerName>
<vendor>SuperNETOrg</vendor>
<finalPageActionList>
<runProgram>
<program>/bin/Agama</program>
<program>${user_home_directory}/bin/Agama</program>
<programArguments>&amp;</programArguments>
<progressText>Do you want to launch ${project.fullName} now?</progressText>
<runAs>$USER</runAs>
</runProgram>
</finalPageActionList>
<parameterList>
@ -346,7 +382,7 @@
<description>Installer.Parameter.installdir.description</description>
<explanation>Installer.Parameter.installdir.explanation</explanation>
<value></value>
<default>/opt/AgamaApp</default>
<default>${user_home_directory}/.AgamaApp</default>
<allowEmptyValue>0</allowEmptyValue>
<cliOptionName>prefix</cliOptionName>
<mustBeWritable>1</mustBeWritable>
@ -393,8 +429,8 @@
</booleanParameter>
</parameterList>
</parameterGroup>
<labelParameter name="reinstall" description="Re-install current version">
<title>Re-install</title>
<labelParameter name="reinstall" description="Upgrade current version">
<title>Upgrade</title>
<explanation></explanation>
<image></image>
</labelParameter>

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

@ -96,7 +96,29 @@
</runProgram>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/Library/Application Support/Iguana</path>
<path>${user_home_directory}/Library/Application Support/Agama</path>
<progressText>Deleting user data</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_user_data}</value1>
<value2>1</value2>
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/Library/Application Support/iguana</path>
<progressText>Deleting user data</progressText>
<ruleList>
<compareValues>
@ -154,6 +176,16 @@
</compareValues>
</ruleList>
</exit>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/Library/Application Support/iguana/shepherd</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${user_home_directory}/Library/Application Support/iguana/config.json</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<createDirectory>
<abortOnError>0</abortOnError>
<explanation>Creating ZcashParam directory</explanation>
@ -304,8 +336,8 @@
</booleanParameter>
</parameterList>
</parameterGroup>
<labelParameter name="reinstall" description="Re-install current version">
<title>Re-install</title>
<labelParameter name="reinstall" description="Upgrade current version">
<title>Upgrade</title>
<explanation></explanation>
<image></image>
</labelParameter>

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

@ -217,6 +217,28 @@
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${windows_folder_appdata}/Iguana</path>
<progressText>Deleting user data</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_user_data}</value1>
<value2>1</value2>
</compareValues>
</ruleList>
</deleteFile>
<deleteFile>
<explanation>Deleting zcash params</explanation>
<path>${windows_folder_appdata}/ZcashParams/</path>
@ -255,6 +277,16 @@
</compareValues>
</ruleList>
</exit>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${windows_folder_appdata}/Iguana/shepherd</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<deleteFile>
<explanation>Deleting user data</explanation>
<path>${windows_folder_appdata}/Iguana/config.json</path>
<progressText>Deleting user data</progressText>
</deleteFile>
<showProgressDialog>
<title>Downloading files</title>
<actionList>
@ -494,8 +526,8 @@
</booleanParameter>
</parameterList>
</parameterGroup>
<labelParameter name="reinstall" description="Re-install current version">
<title>Re-install</title>
<labelParameter name="reinstall" description="Upgrade current version">
<title>Upgrade</title>
<explanation></explanation>
<image></image>
</labelParameter>

49
binary_artifacts.sh
View File

@ -1,11 +1,58 @@
echo Refreshing binaries from artifacts.supernet.org
echo =========================================
echo Step: Removing old binaries
mkdir -p build
cd build
rm -rvf artifacts.supernet.org
echo
echo Step: Cloning latest binaries for build
wget --recursive --no-parent https://artifacts.supernet.org/latest/
chmod -R +x artifacts.supernet.org/latest/
cd ..
echo =========================================
echo
echo
echo =========================================
echo Step: Moving osx binaries from artifacts to assets/bin/osx/
echo
mv -fv build/artifacts.supernet.org/latest/osx/iguana assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/komodo-cli assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/komodod assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/libgcc_s.1.dylib assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/libgomp.1.dylib assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/libnanomsg.5.0.0.dylib assets/bin/osx/
mv -fv build/artifacts.supernet.org/latest/osx/libstdc++.6.dylib assets/bin/osx/
echo
echo =========================================
echo Step: Moving Win64 binaries from artifacts to assets/bin/win64/
echo
mv -fv build/artifacts.supernet.org/latest/windows/genkmdconf.bat assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/iguana.exe assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/index.html assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/komodo-cli.exe assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/komodo-tx.exe assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/komodod.exe assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libcrypto-1_1.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libcurl-4.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libcurl.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libgcc_s_sjlj-1.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libnanomsg.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libssl-1_1.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/libwinpthread-1.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/nanomsg.dll assets/bin/win64/
mv -fv build/artifacts.supernet.org/latest/windows/pthreadvc2.dll assets/bin/win64/
echo
echo =========================================
echo Step: Moving linux64 binaries from artifacts to assets/bin/linux64
echo
mv -fv build/artifacts.supernet.org/latest/linux/iguana assets/bin/linux64/
mv -fv build/artifacts.supernet.org/latest/linux/komodo-cli assets/bin/linux64/
mv -fv build/artifacts.supernet.org/latest/linux/komodod assets/bin/linux64/
echo
echo =========================================
echo Step: Cleaning artifacts data
echo
rm -rf build/
echo
echo =========================================
echo Step: Finished Updating binaries from artifacts
echo

18
routes/shepherd.js
View File

@ -38,11 +38,11 @@ var iguanaConfsDirSrc = path.join(__dirname, '../assets/deps/confs'),
// SETTING APP ICON FOR LINUX AND WINDOWS
if (os.platform() === 'darwin') {
fixPath();
var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/iguana'),
var iguanaBin = path.join(__dirname, '../assets/bin/osx/iguana'),
iguanaDir = process.env.HOME + '/Library/Application Support/iguana',
iguanaConfsDir = iguanaDir + '/confs',
komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/komodod'),
komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/komodo-cli'),
komododBin = path.join(__dirname, '../assets/bin/osx/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/osx/komodo-cli'),
komodoDir = process.env.HOME + '/Library/Application Support/Komodo',
zcashdBin = '/Applications/ZCashSwingWalletUI.app/Contents/MacOS/zcashd',
zcashcliBin = '/Applications/ZCashSwingWalletUI.app/Contents/MacOS/zcash-cli',
@ -50,17 +50,17 @@ if (os.platform() === 'darwin') {
}
if (os.platform() === 'linux') {
var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/iguana'),
var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'),
iguanaDir = process.env.HOME + '/.iguana',
iguanaConfsDir = iguanaDir + '/confs',
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'),
komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodod'),
komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodo-cli'),
komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'),
komodoDir = process.env.HOME + '/.komodo';
}
if (os.platform() === 'win32') {
var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/iguana.exe');
var iguanaBin = path.join(__dirname, '../assets/bin/win64/iguana.exe');
iguanaBin = path.normalize(iguanaBin);
iguanaDir = process.env.APPDATA + '/iguana';
iguanaDir = path.normalize(iguanaDir);
@ -68,9 +68,9 @@ if (os.platform() === 'win32') {
iguanaConfsDir = path.normalize(iguanaConfsDir);
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'),
iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc),
komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/komodod.exe'),
komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'),
komododBin = path.normalize(komododBin),
komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/komodo-cli.exe'),
komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'),
komodocliBin = path.normalize(komodocliBin),
komodoDir = process.env.APPDATA + '/Komodo',
komodoDir = path.normalize(komodoDir);

Write Preview
Loading…
Cancel
Save