balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix d9405292a4

Browse Source
This commit is contained in:
Grégoire Henry 2018-01-18 16:05:06 +01:00 committed by Grégoire
parent e6f773f697
commit 525b09259f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/apply_patch.sh
View File

@ -18,7 +18,7 @@ set -e
case "$branch" in case "$branch" in
zeronet) zeronet)
sed -i s/TEZOS/TEZOS_ZERONET/ ./lib_node_shell/distributed_db_message.ml sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_node_shell/distributed_db_message.ml
patch -p1 < scripts/alphanet_constants.patch patch -p1 < scripts/alphanet_constants.patch
patch -p1 < scripts/zeronet.patch patch -p1 < scripts/zeronet.patch
cp README.md docs/README.master cp README.md docs/README.master
@ -27,7 +27,7 @@ case "$branch" in
echo "Done" echo "Done"
;; ;;
alphanet) alphanet)
sed -i s/TEZOS/TEZOS_ALPHANET/ ./lib_node_shell/distributed_db_message.ml sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_node_shell/distributed_db_message.ml
patch -p1 < scripts/alphanet_constants.patch patch -p1 < scripts/alphanet_constants.patch
cp README.md docs/README.master cp README.md docs/README.master
cp docs/README.alphanet README.md cp docs/README.alphanet README.md

2
src/bin_client/tezos-init-sandboxed-client.sh
View File

@ -224,7 +224,7 @@ main () {
local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")" local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
if [ $(basename "$bin_dir") = "bin_client" ]; then if [ $(basename "$bin_dir") = "bin_client" ]; then
local_client="${local_client:-$bin_dir/../_build/default/bin_client/main.exe}" local_client="${local_client:-$bin_dir/../../_build/default/src/bin_client/main.exe}"
fi fi
if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then

4
src/bin_node/tezos-sandboxed-node.sh
View File

@ -51,8 +51,8 @@ main() {
local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")" local bin_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")"
if [ $(basename "$bin_dir") = "bin_node" ]; then if [ $(basename "$bin_dir") = "bin_node" ]; then
local_node="${local_node:-$bin_dir/../_build/default/bin_node/main.exe}" local_node="${local_node:-$bin_dir/../../_build/default/src/bin_node/main.exe}"
sandbox_file="${sandbox_file:-$bin_dir/../scripts/sandbox.json}" sandbox_file="${sandbox_file:-$bin_dir/../../scripts/sandbox.json}"
fi fi
if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then if [ $# -lt 1 ] || [ "$1" -le 0 ] || [ 10 -le "$1" ]; then

8
test/lib/test_lib.inc.sh
View File

@ -7,10 +7,10 @@ cd "$test_dir"
sandbox_file="$test_dir/sandbox.json" sandbox_file="$test_dir/sandbox.json"
tezos_sandboxed_node="${1:-$test_dir/../bin_node/tezos-sandboxed-node.sh}" tezos_sandboxed_node="${1:-$test_dir/../src/bin_node/tezos-sandboxed-node.sh}"
local_node="${2:-$test_dir/../_build/default/bin_node/main.exe}" local_node="${2:-$test_dir/../_build/default/src/bin_node/main.exe}"
tezos_init_sandboxed_client="${3:-$test_dir/../bin_client/tezos-init-sandboxed-client.sh}" tezos_init_sandboxed_client="${3:-$test_dir/../src/bin_client/tezos-init-sandboxed-client.sh}"
local_client="${4:-$test_dir/../_build/default/bin_client/main.exe}" local_client="${4:-$test_dir/../_build/default/src/bin_client/main.exe}"
source $tezos_sandboxed_node source $tezos_sandboxed_node
source $tezos_init_sandboxed_client source $tezos_init_sandboxed_client