diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8941fdcfc..f56c24c71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: variables: - VERSION: 0.3.14 + VERSION: 0.4.0 VERUS_CLI_LINUX: "Verus-CLI-Linux-v${VERSION}-beta.tar.gz" VERUS_CLI_WINDOWS: "Verus-CLI-Windows-v${VERSION}-beta.zip" VERUS_CLI_MACOS: "Verus-CLI-MacOS-v${VERSION}-beta.tar.gz" diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index eed1a1c91..4ddd78c7e 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.13-beta +VerusCoin Command Line Tools v0.4.0-beta Contents: komodod - VerusCoin's enhanced Komodo daemon diff --git a/kmd/linux/verus-cli/fetch-params b/kmd/linux/verus-cli/fetch-params index 10bade7cb..fd602b858 100644 --- a/kmd/linux/verus-cli/fetch-params +++ b/kmd/linux/verus-cli/fetch-params @@ -2,10 +2,17 @@ set -eu -PARAMS_DIR="$HOME/.zcash-params" +if [[ "$OSTYPE" == "darwin"* ]]; then + PARAMS_DIR="$HOME/Library/Application Support/ZcashParams" +else + PARAMS_DIR="$HOME/.zcash-params" +fi SPROUT_PKEY_NAME='sprout-proving.key' SPROUT_VKEY_NAME='sprout-verifying.key' +SAPLING_SPEND_NAME='sapling-spend.params' +SAPLING_OUTPUT_NAME='sapling-output.params' +SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params' SPROUT_URL="https://z.cash/downloads" SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo" @@ -14,10 +21,12 @@ SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')" WGETCMD="$(command -v wget || echo '')" IPFSCMD="$(command -v ipfs || echo '')" +CURLCMD="$(command -v curl || echo '')" # fetch methods can be disabled with ZC_DISABLE_SOMETHING=1 ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}" ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}" +ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}" function fetch_wget { if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then @@ -28,7 +37,6 @@ function fetch_wget { local dlname="$2" cat <&2 </$lockfile" - # acquire the lock - flock -n 200 \ - && return 0 \ - || return 1 + if [[ "$OSTYPE" == "darwin"* ]]; then + if shlock -f ${lockfile} -p $$; then + return 0 + else + return 1 + fi + else + # create lock file + eval "exec 200>$lockfile" + # acquire the lock + flock -n 200 \ + && return 0 \ + || return 1 + fi } function exit_locked_error { @@ -122,10 +154,8 @@ function main() { cat <