From 4537d69e2992cb2e48123d801c4df6015daeb8af Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Thu, 3 Dec 2015 18:58:50 +0100
Subject: [PATCH] Fix: 32 bits & 64 bits releases + add a better disclaimer for
installation finshed
---
.travis.yml | 14 ++++++++++++--
install.sh | 15 ++++++++++++---
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a01b90657..7c648f4b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,21 @@ after_success:
before_deploy:
# Download & embed Nodejs binary
- NVER=`node -v`
+ - wget http://nodejs.org/dist/${NVER}/node-${NVER}-linux-x86.tar.gz
- wget http://nodejs.org/dist/${NVER}/node-${NVER}-linux-x64.tar.gz
+ - tar xzf node-${NVER}-linux-x86.tar.gz
- tar xzf node-${NVER}-linux-x64.tar.gz
- mv node-${NVER}-linux-x64 node
- rm node-${NVER}-linux-x64.tar.gz
# Clean testing packages
- npm prune --production
- - tar czf ../ucoin.tar.gz ./ --exclude ".git" --exclude "coverage" --exclude "test" --exclude "share"
+ - tar czf ../ucoin.64bits.tar.gz ./ --exclude ".git" --exclude "coverage" --exclude "test" --exclude "share" --exclude "node-${NVER}-linux-x86.tar.gz" --exclude "node-${NVER}-linux-x86"
+ - rm -Rf node_modules node
+ - node-gyp clean configure build --verbose --arch=ia32
+ - npm install --production
+ - mv node-${NVER}-linux-x86 node
+ - rm node-${NVER}-linux-x86.tar.gz
+ - tar czf ../ucoin.32bits.tar.gz ./ --exclude ".git" --exclude "coverage" --exclude "test" --exclude "share"
# Releases deployed on GitHub
deploy:
@@ -31,7 +39,9 @@ deploy:
skip_cleanup: true
api_key:
secure: feyz5YmzYj6g6ZJKAv7u3pp9j9OY6oL4Pcx8mkha25BT1kEIu7lzvkZu4mJAIDjCxJjEkce3fNGXhRICqoMhRy/FK5dUUTpmP3KoMLNNJboO+MhDqjPEb6OYyafikSWnm0BszPL38FzSYMdmvNZ6WirOyVfrdzVPgU6MG0D99w8=
- file: ../ucoin.tar.gz
+ file:
+ - ../ucoin.32bits.tar.gz
+ - ../ucoin.64bits.tar.gz
on:
repo: ucoin-io/ucoin
tags: true
diff --git a/install.sh b/install.sh
index a4e6ce0e8..e5972476e 100644
--- a/install.sh
+++ b/install.sh
@@ -91,7 +91,7 @@ install_ucoin_from_git() {
# Download Nodejs
local NVER="0.12.6";
- local ARCH="32"
+ local ARCH="86"
local X64=`uname -r | grep "x86_64"`
if [ ! -z X64 ]; then
ARCH="64"
@@ -124,8 +124,13 @@ install_ucoin_from_git() {
}
install_ucoin_as_script() {
+ local ARCH="32"
+ local X64=`uname -r | grep "x86_64"`
+ if [ ! -z X64 ]; then
+ ARCH="64"
+ fi
local UCOIN_SOURCE_LOCAL
- UCOIN_SOURCE_LOCAL=https://github.com/ucoin-io/ucoin/releases/download/$(ucoin_latest_version)/ucoin.tar.gz
+ UCOIN_SOURCE_LOCAL=https://github.com/ucoin-io/ucoin/releases/download/$(ucoin_latest_version)/ucoin.${ARCH}bits.tar.gz
local UCOIN_ARCHIVE
UCOIN_ARCHIVE=$UCOIN_DIR/ucoin.tar.gz
@@ -251,7 +256,11 @@ ucoin_do_install() {
fi
fi
- echo "=> Close and reopen your terminal to start using ucoin"
+ echo "=> ------------------------------------------------------"
+ echo "=> ! !"
+ echo "=> ! CLOSE and REOPEN YOUR TERMINAL to start using ucoin !"
+ echo "=> ! !"
+ echo "=> ------------------------------------------------------"
ucoin_reset
}
--
GitLab