Don't use -z in Bash scripts with -u set

3650-Real-Estate-Trust-2-LLC · Aug 5, 2024 · 3fcbd7c · 3fcbd7c
1 parent 202802f
commit 3fcbd7c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/sh/checkout_settler_commit.sh b/sh/checkout_settler_commit.sh
@@ -128,7 +128,7 @@ declare rpc_url
 rpc_url="$(get_api_secret rpcUrl)"
 declare -r rpc_url
 
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi

diff --git a/sh/common_safe.sh b/sh/common_safe.sh
@@ -9,7 +9,7 @@ if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     rpc_url="$(get_api_secret rpcUrl)"
     declare -r rpc_url
 fi
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi

diff --git a/sh/deploy_allowanceholder.sh b/sh/deploy_allowanceholder.sh
@@ -125,7 +125,7 @@ cd "$project_root"
 declare rpc_url
 rpc_url="$(get_api_secret rpcUrl)"
 declare -r rpc_url
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi

diff --git a/sh/deploy_new_chain.sh b/sh/deploy_new_chain.sh
@@ -166,7 +166,7 @@ declare rpc_url
 rpc_url="$(get_api_secret rpcUrl)"
 declare -r rpc_url
 
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi

diff --git a/sh/deploy_safe_infra.sh b/sh/deploy_safe_infra.sh
@@ -142,7 +142,7 @@ declare rpc_url
 rpc_url="$(get_api_secret rpcUrl)"
 declare -r rpc_url
 
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi

diff --git a/sh/verify_settler.sh b/sh/verify_settler.sh
@@ -128,7 +128,7 @@ declare -r -i chainid
 declare rpc_url
 rpc_url="$(get_api_secret rpcUrl)"
 declare -r rpc_url
-if [[ -z $rpc_url ]] ; then
+if [[ ${rpc_url:-unset} = 'unset' ]] ; then
     echo '`rpcUrl` is unset in `api_secrets.json` for chain "'"$chain_name"'"' >&2
     exit 1
 fi