george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs_relative_path broke on MacOS X.

Browse Source
This commit is contained in:
tlimoncelli@stackexchange.com
2015-07-03 11:43:52 -04:00
parent f5eeffd043
commit eab0418ffe
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/_blackbox_common.sh
View File

@@ -25,6 +25,12 @@ source "${0%/*}"/_stack_lib.sh
# Allow overriding gpg command # Allow overriding gpg command
: "${GPG:=gpg}" ; : "${GPG:=gpg}" ;
function physical_directory_of() {
local d=$(dirname "$1")
local f=$(basename "$1")
(cd "$d" && echo $(pwd -P)"/$f" )
}
# Set REPOBASE to the top of the repository # Set REPOBASE to the top of the repository
# Set VCS_TYPE to 'git', 'hg', 'svn' or 'unknown' # Set VCS_TYPE to 'git', 'hg', 'svn' or 'unknown'
if which >/dev/null 2>/dev/null git && git rev-parse --show-toplevel >/dev/null 2>&1 ; then if which >/dev/null 2>/dev/null git && git rev-parse --show-toplevel >/dev/null 2>&1 ; then
@@ -52,6 +58,7 @@ else
REPOBASE="$(pwd)" REPOBASE="$(pwd)"
fi fi
export VCS_TYPE export VCS_TYPE
export REPOBASE=$(physical_directory_of "$REPOBASE")
# FIXME: Verify this function by checking for .hg or .git # FIXME: Verify this function by checking for .hg or .git
# after determining what we believe to be the answer. # after determining what we believe to be the answer.