From f359eee12f4370a44b201fa30694d1f19364b968 Mon Sep 17 00:00:00 2001 From: ca333 Date: Sat, 2 Sep 2017 23:57:27 +0200 Subject: [PATCH] 333 --- binary_artifacts.sh | 29 +++++++++++++++----------- buildscripts/electron-build-linux.sh | 8 +++---- buildscripts/electron-build-osx.sh | 4 ++-- buildscripts/electron-build-windows.sh | 8 +++---- private/kmdcli.js | 10 ++++----- routes/shepherd.js | 16 +++++++------- 6 files changed, 40 insertions(+), 35 deletions(-) diff --git a/binary_artifacts.sh b/binary_artifacts.sh index cfcd6b3..f959d1a 100755 --- a/binary_artifacts.sh +++ b/binary_artifacts.sh @@ -14,26 +14,31 @@ wget --recursive --no-parent https://artifacts.supernet.org/latest/ cd .. echo ========================================= echo -pwd +pwd echo ========================================= echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/ -echo +echo chmod +x assets/artifacts.supernet.org/latest/osx/iguana \ assets/artifacts.supernet.org/latest/osx/komodo* + #cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/ -#echo -#echo ========================================= -#echo Step: Copying Windows binaries from artifacts to assets/bin/win64/ -#echo -#cp -rvf assets/artifacts.supernet.org/latest/windows/* assets/bin/win64/ -echo + +echo Moving OSX bins to assets/bin +mv assets/artifacts.supernet.org/latest/osx assets/bin/osx + +echo ========================================= +echo Step: Moving Windows binaries from artifacts to assets/bin/win64/ +#echo +mv assets/artifacts.supernet.org/latest/windows assets/bin/win64 +echo echo ========================================= echo Step: Permissions +x for linux64 binaries from artifacts to assets/bin/linux64 -echo +echo chmod +x assets/artifacts.supernet.org/latest/linux/iguana \ assets/artifacts.supernet.org/latest/linux/komodo* -#cp -rvf assets/artifacts.supernet.org/latest/linux/* assets/bin/linux64/ -echo +echo Moving Linux bins to assets/bin +mv assets/artifacts.supernet.org/latest/linux assets/bin/linux64/ +echo echo ========================================= echo Step: Finished Updating binaries from artifacts -echo +echo diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index b3dcb29..5ada890 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -7,11 +7,11 @@ echo echo "Build script for Iguana application for Linux x64 platform." -echo "Preparing electron package $AGAMA_VERSION" +echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=linux --arch=x64 \ --icon=assets/icons/iguana_app_icon_png/128x128.png \ --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/artifacts.supernet.org/latest/windows \ - --ignore=assets/artifacts.supernet.org/latest/osx \ - --overwrite + --ignore=assets/bin/win64 \ + --ignore=assets/bins/osx \ + --overwrite diff --git a/buildscripts/electron-build-osx.sh b/buildscripts/electron-build-osx.sh index 9c130b8..7323871 100755 --- a/buildscripts/electron-build-osx.sh +++ b/buildscripts/electron-build-osx.sh @@ -12,6 +12,6 @@ echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=darwin --arch=x64 \ --icon=assets/icons/iguana_app_icon.icns \ --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/artifacts.supernet.org/latest/windows \ - --ignore=assets/artifacts.supernet.org/latest/linux \ + --ignore=assets/bin/win64 \ + --ignore=assets/bin/linux64 \ --overwrite diff --git a/buildscripts/electron-build-windows.sh b/buildscripts/electron-build-windows.sh index 67c3c6b..439aa37 100755 --- a/buildscripts/electron-build-windows.sh +++ b/buildscripts/electron-build-windows.sh @@ -7,11 +7,11 @@ echo echo "Build script for Iguana application for Windows x64 platform." -echo "Preparing electron package $AGAMA_VERSION" +echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=win32 --arch=ia32 \ --icon=assets/icons/iguana_app_icon.ico \ --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/artifacts.supernet.org/latest/osx \ - --ignore=assets/artifacts.supernet.org/latest/linux \ - --overwrite + --ignore=assets/bin/osx \ + --ignore=assets/bin/linux64 \ + --overwrite diff --git a/private/kmdcli.js b/private/kmdcli.js index df645dd..cff8afd 100644 --- a/private/kmdcli.js +++ b/private/kmdcli.js @@ -31,16 +31,16 @@ var child_process = require('child_process'), os = require('os'); if (os.platform() === 'darwin') { - var komodocliBin = path.join(__dirname, '../assets/artifacts.supernet.org/latest/osx/komodo-cli'), + var komodocliBin = path.join(__dirname, '../assets/bin/osx/komodo-cli'), zcashcliBin = '/Applications/ZCashSwingWalletUI.app/Contents/MacOS/zcash-cli'; } if (os.platform() === 'linux') { - var komodocliBin = path.join(__dirname, '../assets/artifacts.supernet.org/latest/linux/komodo-cli'); + var komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'); } if (os.platform() === 'win32') { - var komodocliBin = path.join(__dirname, '../assets/artifacts.supernet.org/latest/windows/komodo-cli.exe'), + var komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'), komodocliBin = path.normalize(komodocliBin); } @@ -116,11 +116,11 @@ function parse_kmdcli_commands(callback) { * "notaryid" : -1, * "pubkey" : "000000000000000000000000000000000000000000000000000000000000000000" * } - * + * */ function command(kmd_command, callback) { if (callback) { return this.exec(komodocliBin + " " + kmd_command, - parse_kmdcli_commands(callback)); + parse_kmdcli_commands(callback)); } } diff --git a/routes/shepherd.js b/routes/shepherd.js index ba81c5d..7ad0c02 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -46,7 +46,7 @@ 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, '../assets/artifacts.supernet.org/latest/osx/iguana'), + var iguanaBin = path.join(__dirname, '../assets/osx/iguana'), iguanaDir = `${process.env.HOME}/Library/Application Support/iguana`, iguanaConfsDir = `${iguanaDir}/confs`, komododBin = path.join(__dirname, '../assets/bin/osx/komodod'), @@ -59,7 +59,7 @@ if (os.platform() === 'darwin') { } if (os.platform() === 'linux') { - var iguanaBin = path.join(__dirname, '../assets/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'), @@ -70,7 +70,7 @@ if (os.platform() === 'linux') { } if (os.platform() === 'win32') { - var iguanaBin = path.join(__dirname, '../assets/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); @@ -78,9 +78,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, '../assets/artifacts.supernet.org/latest/windows/komodod.exe'), + komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'), komododBin = path.normalize(komododBin), - komodocliBin = path.join(__dirname, '../assets/artifacts.supernet.org/latest/windows/komodo-cli.exe'), + komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'), komodocliBin = path.normalize(komodocliBin), komodoDir = shepherd.appConfig.dataDir.length ? shepherd.appConfig.dataDir : `${process.env.APPDATA}/Komodo`, komodoDir = path.normalize(komodoDir); @@ -1783,8 +1783,8 @@ shepherd.post('/setconf', function(req, res) { if (os.platform() === 'win32' && req.body.chain == 'komodod') { - setkomodoconf = spawn(path.join(__dirname, '../assets/artifacts.supernet.org/latest/windows/genkmdconf.bat')); - setkomodoconf = spawn(path.join(__dirname, '../assets/artifacts.supernet.org/latest/windows/genkmdconf.bat')); + setkomodoconf = spawn(path.join(__dirname, '../assets/bin/win64/genkmdconf.bat')); + //setkomodoconf = spawn(path.join(__dirname, '../assets/bin/win64/genkmdconf.bat')); } else { setConf(req.body.chain); } @@ -2609,4 +2609,4 @@ shepherd.appInfo = function() { }; } -module.exports = shepherd; \ No newline at end of file +module.exports = shepherd;