$NetBSD: patch-bin_gng,v 1.3 2023/02/08 15:51:46 schmonz Exp $ Use pkgsrc paths. --- bin/gng.orig 2021-10-13 09:10:21.000000000 +0000 +++ bin/gng @@ -1,24 +1,15 @@ #!/usr/bin/env bash + +PREFIX=@PREFIX@ + readonly SAVED_OPTS="$( shopt -po shopt -p )" -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - TARGET="$(readlink "$SOURCE")" - if [[ $TARGET == /* ]]; then - SOURCE="$TARGET" - else - SELF_DIR="$(dirname "$SOURCE")" - SOURCE="$SELF_DIR/$TARGET" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located - fi -done -SELF_DIR="$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)" -readonly SELF_DIR # shellcheck disable=SC1090 -source "${SELF_DIR}/../lib/common.sh" || { - echo "Failed to load common.sh in ${SELF_DIR}" +source "${PREFIX}/share/gng/common.sh" || { + echo "Failed to load ${PREFIX}/share/gng/common.sh" exit 1 } # DEFAULTS may be overridden by calling environment. @@ -78,7 +69,7 @@ function __install_gw() { info "Installing Gradle Wrapper in ${dir}. (version=${version}, distributionType=${type}, mirrorUrl=${mirrorUrl:-})" #Copy the embedded Gradle Wrapper - local srcDir="${SELF_DIR}/.." + local srcDir="${PREFIX}/share/gng" cp -f "${srcDir}/gradle/gng.cfg" "${dir}/gradle/" cp -f "${srcDir}/gradle/gradlew" "${dir}/" cp -f "${srcDir}/gradle/gradlew.bat" "${dir}/" @@ -141,17 +132,7 @@ bootstrap_help() { } function parse_gradle_version() { - if command -v python &> /dev/null - then - python -c "import json,sys; obj=json.load(sys.stdin); print obj['version'];" - return - fi - if command -v python3 &> /dev/null - then - python3 -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);" - return - fi - die "Cannot find python/python3 interpreter !" + @PYTHONBIN@ -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);" } function bootstrap() {