From 035042d69f7c3157501de7eb58666e59eeee6492 Mon Sep 17 00:00:00 2001 From: Marco Stronati Date: Sun, 4 Feb 2018 17:38:08 +0100 Subject: [PATCH] Scripts: fix alphanet/zeronet patch --- scripts/alphanet_constants.patch | 6 +++--- scripts/apply_patch.sh | 12 ++++-------- scripts/zeronet.patch | 6 +++--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch index 64b54eac2..358d402b9 100644 --- a/scripts/alphanet_constants.patch +++ b/scripts/alphanet_constants.patch @@ -1,7 +1,7 @@ -diff --git a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml +diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml index 61e79c8a..f91ce282 100644 ---- a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml -+++ b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml +--- a/src/proto_alpha/lib_protocol/src/constants_repr.ml ++++ b/src/proto_alpha/lib_protocol/src/constants_repr.ml @@ -49,15 +49,14 @@ let read_public_key s = Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) diff --git a/scripts/apply_patch.sh b/scripts/apply_patch.sh index d3b18d352..fbd543b67 100755 --- a/scripts/apply_patch.sh +++ b/scripts/apply_patch.sh @@ -18,20 +18,16 @@ set -e case "$branch" in zeronet) - sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_node_shell/distributed_db_message.ml + sed -i s/TEZOS/TEZOS_ZERONET/ ./src/lib_shell/distributed_db_message.ml patch -p1 < scripts/alphanet_constants.patch patch -p1 < scripts/zeronet.patch - cp README.md docs/README.master - cp docs/README.zeronet README.md - if has_git; then git add docs/README.master; git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI "; fi + if has_git; then git commit -a -m "Zeronet: DO NOT MERGE" --author "Tezos CI "; fi echo "Done" ;; alphanet) - sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_node_shell/distributed_db_message.ml + sed -i s/TEZOS/TEZOS_ALPHANET/ ./src/lib_shell/distributed_db_message.ml patch -p1 < scripts/alphanet_constants.patch - cp README.md docs/README.master - cp docs/README.alphanet README.md - if has_git; then git add docs/README.master; git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI "; fi + if has_git; then git commit -a -m "Alphanet: DO NOT MERGE" --author "Tezos CI "; fi echo "Done" ;; *) diff --git a/scripts/zeronet.patch b/scripts/zeronet.patch index 197a17515..321914168 100644 --- a/scripts/zeronet.patch +++ b/scripts/zeronet.patch @@ -22,9 +22,9 @@ diff --git a/scripts/alphanet.sh b/scripts/alphanet.sh if [ $ALPHANET_EMACS ]; then interactive_flags="-t" -diff --git a/src/node/main/node_config_file.ml b/src/node/main/node_config_file.ml ---- a/src/node/main/node_config_file.ml -+++ b/src/node/main/node_config_file.ml +diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml +--- a/src/bin_node/node_config_file.ml ++++ b/src/bin_node/node_config_file.ml @@ -16,7 +16,7 @@ let home = with Not_found -> "/root"