Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Commit 87144bf

Browse files
author
Silas Davis
authored
Merge pull request #1455 from hyperledger/hotfix/portability-to-main
Portability branch > master
2 parents a4c0f43 + 5a95d00 commit 87144bf

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# ----------------------------------------------------------
1212

13-
SHELL := /bin/bash
13+
SHELL := /usr/bin/env bash
1414
REPO := $(shell pwd)
1515

1616
# Our own Go files containing the compiled bytecode of solidity files as a constant

js/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
export this="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
source "$this/../tests/test_runner.sh"

scripts/commit_hash.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
commit=$(git describe --tags)
55
dirty=$(git ls-files -m)
66
if [[ -n ${dirty} ]]; then
7-
commit="$commit+dirty.$(echo ${dirty} | git hash-object --stdin | head -c8)"
7+
commit="$commit+dirty.$(echo ${dirty} | git hash-object --stdin | dd bs=8 count=1 status=none)"
88
fi
99
echo "$commit"
1010

scripts/version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
set -euo pipefail
33
IFS=$'\n\t'
44

tests/dump/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /bin/bash
1+
#!/usr/bin/env bash
22

33
# Test the dump restore functionality
44
#
@@ -48,7 +48,7 @@ echo -e "${title//?/-}\n${title}\n${title//?/-}\n"
4848

4949
$burrow_bin dump remote -b dump.bin
5050
$burrow_bin dump remote dump.json
51-
height=$(head -1 dump.json | jq .Height)
51+
height=$(head -n 1 dump.json | jq .Height)
5252

5353
kill $burrow_pid
5454

tests/keys_server/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /bin/bash
1+
#!/usr/bin/env bash
22

33
# tests
44
# run the suite with and without the daemon

tests/web3/truffle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
chain=$(mktemp -d)
44
cd $chain
@@ -30,4 +30,4 @@ module.exports = {
3030
}
3131
};
3232
EOF
33-
truffle test --network burrow
33+
truffle test --network burrow

0 commit comments

Comments
 (0)