From ef66b4a2534b01165845ba412eda5ac761c145b3 Mon Sep 17 00:00:00 2001
From: tronch0 <32448470+tronch0@users.noreply.github.com>
Date: Sun, 4 Aug 2019 20:02:50 +0300
Subject: [PATCH] fix(script,makefile): fix prints and order of operations (#9)

* fix(script,makefile): fix prints and order of operations

* fix: update rustlang version

* fix: downgrade rust version

* add version print

* fix: change version

* remove unnecessary code
---
 .travis.yml  |  6 +-----
 ci/Makefile  | 10 ++++------
 ci/script.sh | 10 +++++-----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6caa6e4..26e5210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,9 @@ cache: cargo
   # - "demo/node_modules"
 
 rust:
- - nightly
-
-before_install:
-- rustup self update
+ - nightly-2019-06-22
 
 install:
- - rustup update nightly-2019-06-22
  - rustup component add --toolchain nightly-2019-06-22 rustfmt
  - rustup component add --toolchain nightly-2019-06-22 clippy
  - cargo install wasm-pack || echo "wasm-pack already installed"
diff --git a/ci/Makefile b/ci/Makefile
index 044d456..14abdf7 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -1,20 +1,18 @@
-echo executing makefile
-
 all: install build-wasm build-web
 
 build-wasm:
-	echo building wasm:
+	echo "makefile - building wasm:"
 	wasm-pack build --out-dir ../../demo/pkg/zkif-wasm-zokrates/     ../zkif-wasm-bundles/zkif-wasm-zokrates
 	wasm-pack build --out-dir ../../demo/pkg/zkif-wasm-bulletproofs/ ../zkif-wasm-bundles/zkif-wasm-bulletproofs
 
 build-web:
-	echo build-web:
+	echo "makefile - build-web:"
 	cd ../demo && npm run build
 
 install:
-	echo install:
+	echo "makefile - install:"
 	cd ../demo && npm install
 
 web-dev:
-	echo web-dev:
+	echo "makefile - web-dev:"
 	cd ../demo && npm run start
diff --git a/ci/script.sh b/ci/script.sh
index b5adcfb..1714774 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -2,21 +2,21 @@
 
 set +x
 
-echo executing scripit.sh
+echo -e "executing scripit.sh"
 
-echo processing bulletproof: checks & tests
+echo -e "processing bulletproof: checks & tests:"
 cd ./zkif-wasm-bundles/zkif-wasm-bulletproofs/
 cargo +nightly-2019-06-22 fmt -- --check
 cargo +nightly-2019-06-22 clippy -- -D warnings
 cargo +nightly-2019-06-22 test
 
-echo processing zk-interface wasm example: checks & tests
+echo -e "processing zk-interface wasm example: checks & tests:"
 cd ../zkif-wasm-example
 cargo +nightly-2019-06-22 fmt -- --check
 cargo +nightly-2019-06-22 clippy -- -D warnings
 cargo +nightly-2019-06-22 test
 
-echo processing zokrates: checks & tests
+echo -e "processing zokrates: checks & tests:"
 cd ../zkif-wasm-zokrates
 cargo +nightly-2019-06-22 fmt -- --check
 cargo +nightly-2019-06-22 clippy -- -D warnings
@@ -24,6 +24,6 @@ cargo +nightly-2019-06-22 test
 
 cd ../../ci
 make
-cd ../demo
+# cd ../demo
 #npm install
 #npm run build