diff --git a/zcutil/build.sh b/zcutil/build.sh index a2e12f5c0..6c157bd1f 100755 --- a/zcutil/build.sh +++ b/zcutil/build.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/sh export LC_ALL=C -set -eu -o pipefail +set -eu set +x -function cmd_pref() { - if type -p "$2" > /dev/null; then +cmd_pref() { + if command -v "$2" >/dev/null; then eval "$1=$2" else eval "$1=$3" @@ -13,7 +13,7 @@ function cmd_pref() { } # If a g-prefixed version of the command exists, use it preferentially. -function gprefix() { +gprefix() { cmd_pref "$1" "g$2" "$2" } @@ -22,21 +22,21 @@ cd "$(dirname "$("$READLINK" -f "$0")")/.." # Allow user overrides to $MAKE. Typical usage for users who need it: # MAKE=gmake ./zcutil/build.sh -j$(nproc) -if [[ -z "${MAKE-}" ]]; then +if [ -z "${MAKE-}" ]; then MAKE=make fi # Allow overrides to $BUILD and $HOST for porters. Most users will not need it. # BUILD=i686-pc-linux-gnu ./zcutil/build.sh -if [[ -z "${BUILD-}" ]]; then +if [ -z "${BUILD-}" ]; then BUILD="$(./depends/config.guess)" fi -if [[ -z "${HOST-}" ]]; then +if [ -z "${HOST-}" ]; then HOST="$BUILD" fi # Allow users to set arbitrary compile flags. Most users will not need this. -if [[ -z "${CONFIGURE_FLAGS-}" ]]; then +if [ -z "${CONFIGURE_FLAGS-}" ]; then CONFIGURE_FLAGS="" fi @@ -69,13 +69,13 @@ set -x eval "$MAKE" --version as --version -ENABLE_DEBUG_REGEX='^(.*\s)?--enable-debug(\s.*)?$' -if [[ "$CONFIGURE_FLAGS" =~ $ENABLE_DEBUG_REGEX ]] -then +case "$CONFIGURE_FLAGS" in +(*"--enable-debug"*) DEBUG=1 -else +;; +(*) DEBUG= -fi +;;esac HOST="$HOST" BUILD="$BUILD" "$MAKE" "$@" -C ./depends/ DEBUG="$DEBUG" diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh index 25d961ab1..fba5de078 100755 --- a/zcutil/fetch-params.sh +++ b/zcutil/fetch-params.sh @@ -1,9 +1,11 @@ -#!/usr/bin/env bash +#!/bin/sh export LC_ALL=C set -eu -if [[ "$OSTYPE" == "darwin"* ]]; then +uname_S=$(uname -s 2>/dev/null || echo not) + +if [ "$uname_S" = "Darwin" ]; then PARAMS_DIR="$HOME/Library/Application Support/ZcashParams" else PARAMS_DIR="$HOME/.zcash-params" @@ -19,7 +21,7 @@ DOWNLOAD_URL="https://download.z.cash/downloads" IPFS_HASH="/ipfs/QmXRHVGLQBiKwvNq7c2vPxAKz1zRVmMYbmt7G5TQss7tY7" SHA256CMD="$(command -v sha256sum || echo shasum)" -SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')" +SHA256ARGS="$(command -v sha256sum >/dev/null || echo \"-a 256\")" WGETCMD="$(command -v wget || echo '')" IPFSCMD="$(command -v ipfs || echo '')" @@ -30,64 +32,57 @@ ZC_DISABLE_WGET="${ZC_DISABLE_WGET:-}" ZC_DISABLE_IPFS="${ZC_DISABLE_IPFS:-}" ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}" -function fetch_wget { +LOCKFILE=/tmp/fetch_params.lock + +fetch_wget() { if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then return 1 fi - local filename="$1" - local dlname="$2" - cat <&2 <$lockfile" + eval "exec 9>$LOCKFILE" # acquire the lock - flock -n 200 \ + flock -n 9 \ && return 0 \ || return 1 fi } -function exit_locked_error { +exit_locked_error() { echo "Only one instance of fetch-params.sh can be run at a time." >&2 exit 1 } -function main() { +main() { lock fetch-params.sh \ || exit_locked_error @@ -232,5 +233,5 @@ then fi main -rm -f /tmp/fetch_params.lock +rm -f $LOCKFILE exit 0