Merge pull request #1455 from hyperledger/hotfix/portability-to-main

Portability branch > master

Author: Silas Davis

Makefile

@@ -10,7 +10,7 @@
 
 # ----------------------------------------------------------
 
-SHELL := /bin/bash
+SHELL := /usr/bin/env bash
 REPO := $(shell pwd)
 
 # Our own Go files containing the compiled bytecode of solidity files as a constant

js/test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export this="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "$this/../tests/test_runner.sh"

scripts/commit_hash.sh

@@ -4,7 +4,7 @@
 commit=$(git describe --tags)
 dirty=$(git ls-files -m)
 if [[ -n ${dirty} ]]; then
-    commit="$commit+dirty.$(echo ${dirty} | git hash-object --stdin | head -c8)"
+    commit="$commit+dirty.$(echo ${dirty} | git hash-object --stdin | dd bs=8 count=1 status=none)"
 fi
 echo "$commit"
 

scripts/version.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
 

tests/dump/test.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 # Test the dump restore functionality
 #
@@ -48,7 +48,7 @@ echo -e "${title//?/-}\n${title}\n${title//?/-}\n"
 
 $burrow_bin dump remote -b dump.bin
 $burrow_bin dump remote dump.json
-height=$(head -1  dump.json | jq .Height)
+height=$(head -n 1  dump.json | jq .Height)
 
 kill $burrow_pid
 

tests/keys_server/test.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 # tests
 # run the suite with and without the daemon

tests/web3/truffle.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 chain=$(mktemp -d)
 cd $chain
@@ -30,4 +30,4 @@ module.exports = {
   }
 };
 EOF
-truffle test --network burrow
+truffle test --network burrow