Test: fix sandboxed scripts.

This commit is contained in:
Grégoire Henry 2018-02-22 16:10:12 -05:00 committed by Benjamin Canou
parent 40ea190364
commit 59d69c8fb1

View File

@ -2,12 +2,6 @@
set -e set -e
if [ "$is_tezos_sandboxed_init" = "1" ]; then
echo 'The client has already been initialized in this session.' >&2
echo 'Start a new shell session if you wish to reinitialize a client.' >&2
exit
fi
client_dirs=() client_dirs=()
init_sandboxed_client() { init_sandboxed_client() {
@ -216,6 +210,12 @@ usage() {
main () { main () {
if [ "$is_tezos_sandboxed_init" = "1" ]; then
echo 'The client has already been initialized in this session.' >&2
echo 'Start a new shell session if you wish to reinitialize a client.' >&2
exit
fi
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/src/bin_client/main_client.exe}" local_client="${local_client:-$bin_dir/../../_build/default/src/bin_client/main_client.exe}"