Merge branch 'v0.24' of https://github.com/SuperNETorg/Agama into v0.24

binary_artifacts.sh

@@ -18,18 +18,19 @@ pwd
 echo =========================================
 echo Step: Permission +x for OSX binaries from artifacts to assets/bin/osx/
 echo
-chmod +x assets/artifacts.supernet.org/latest/osx/iguana \
-  assets/artifacts.supernet.org/latest/osx/komodo*
+rm assets/artifacts.supernet.org/latest/osx/iguana
+chmod +x assets/artifacts.supernet.org/latest/osx/komodo*
 
-#cp -rvf assets/artifacts.supernet.org/latest/osx/* assets/bin/osx/
 mkdir assets/bin
-echo Moving OSX bins to assets/bin
-wget https://supernetorg.bintray.com/binaries/komodo_OSX_latest.zip
-checksum=`shasum -a 256 komodo_OSX_latest.zip | awk '{ print $1 }'`
-if [ "$checksum" = "c20a1b7268dd0d9bbc8984a0e76cc868d8b4479af18cd1dde4406f63b7f12255" ]; then
+mv assets/artifacts.supernet.org/latest/osx assets/bin/osx
+
+echo Moving legacy libs to assets/bin
+wget https://supernetorg.bintray.com/misc/libs_legacy_osx.zip
+checksum=`shasum -a 256 libs_legacy_osx.zip | awk '{ print $1 }'`
+if [ "$checksum" = "e9474aa243694a2d4c87fccc443e4b16a9a5172a24da76af9e5ecddd006649bb" ]; then
     echo "Checksum is correct."
-    unzip komodo_OSX_latest.zip
-    mv komodo_OSX_latest assets/bin/osx
+    unzip libs_legacy_osx.zip
+    cp -rvf libs_legacy_osx/* assets/bin/osx/.
   else
     echo "Checksum is incorrect!"
     exit 0
@@ -37,16 +38,17 @@ fi
 echo =========================================
 echo Step: Moving Windows binaries from artifacts to assets/bin/win64/
 #echo
+rm assets/artifacts.supernet.org/latest/windows/iguana
 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
-chmod +x assets/artifacts.supernet.org/latest/linux/iguana \
-  assets/artifacts.supernet.org/latest/linux/komodo*
+rm assets/artifacts.supernet.org/latest/linux/iguana
+chmod +x assets/artifacts.supernet.org/latest/linux/komodo*
 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

buildscripts/easydex-build.sh

@@ -9,8 +9,8 @@ echo "Building EasyDEX-GUI"
 echo "Actual directory is: ${PWD}"
 
 echo "Checkout to redux branch."
-git checkout redux
-git pull origin redux
+git checkout electrum
+git pull origin electrum
 
 [ -d react ] && cd react || echo "!!! I can't find react"
 echo "Actual directory is: ${PWD}"

buildscripts/electron-build-linux.sh

@@ -15,4 +15,7 @@ electron-packager . --platform=linux --arch=x64 \
   --buildVersion=$AGAMA_VERSION \
   --ignore=assets/bin/win64 \
   --ignore=assets/bin/osx \
-  --overwrite
+  --ignore=react/node_modules \
+  --ignore=react/src \
+  --ignore=react/www \
+  --overwrite

buildscripts/electron-build-osx.sh

@@ -14,4 +14,7 @@ electron-packager . --platform=darwin --arch=x64 \
   --out=build/ --buildVersion=$AGAMA_VERSION \
   --ignore=assets/bin/win64 \
   --ignore=assets/bin/linux64 \
+  --ignore=react/node_modules \
+  --ignore=react/src \
+  --ignore=react/www \
   --overwrite

buildscripts/electron-build-windows.sh

@@ -16,10 +16,13 @@ electron-packager . --platform=win32 \
   --buildVersion=$AGAMA_VERSION \
   --ignore=assets/bin/osx \
   --ignore=assets/bin/linux64 \
+  --ignore=react/node_modules \
+  --ignore=react/src \
+  --ignore=react/www \
   --overwrite \
   --version-string.CompanyName="SuperNET" \
   --version-string.FileDescription="Agama" \
   --version-string.OriginalFilename="Agama" \
   --version-string.ProductName="Agama" \
   --version-string.InternalName="Agama" \
-  --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved."
+  --app-copyright="Copyright (C) 2017 SuperNET. All rights reserved."

version_build

@@ -1 +1 @@
-0.2.0.24b-beta
+0.2.0.24b-beta