From f741968d6d56a4c791ba538f23d9633fea6c4bc3 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Fri, 1 Jun 2018 12:48:03 -0500 Subject: [PATCH] Drop hard dependency on bash from `git_version_gen.sh` again I can't seem to find a reason why the shell interpreter needs to be bash and not just sh here. Needed to replace `BASH_SOURCE[0]` with the legacy `$0` supported by sh, but otherwise it seems to still work. Many non-Linux platforms do not ship with bash out-of-the-box (and as a shell, I don't think we need to encourage the further proliferation of bash ;-), this lets fish build on a clean install of FreeBSD, which does not have bash. --- build_tools/git_version_gen.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh index 05978d098..cab347e72 100755 --- a/build_tools/git_version_gen.sh +++ b/build_tools/git_version_gen.sh @@ -1,11 +1,13 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # Originally from the git sources (GIT-VERSION-GEN) # Presumably (C) Junio C Hamano # Reused under GPL v2.0 # Modified for fish by David Adam +set -e + # Find the fish git directory as two levels up from script directory. -GIT_DIR="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ) )" && pwd )" +GIT_DIR="$( cd "$( dirname $( dirname "$0" ) )" && pwd )" FBVF=FISH-BUILD-VERSION-FILE DEF_VER=unknown @@ -26,7 +28,7 @@ else VC=unset fi -# Output the FBVF. +# Maybe output the FBVF # It looks like FISH_BUILD_VERSION="2.7.1-621-ga2f065e6" test "$VN" = "$VC" || { echo >&2 "FISH_BUILD_VERSION=$VN"