Merge remote-tracking branch 'mroth/osx-testing' into osx-testing

2018-08-31 07:48:09 -04:00
parent 87f848b07f c6b9c398c8
commit e6363ac955
7 changed files with 75 additions and 11 deletions
--- a/lib/design.sh
+++ b/lib/design.sh
@@ -23,7 +23,7 @@

 # Add ignore rule to .git/info/exclude if not already present
 _design_add_git_exclude(){
-  local git_dir="$(cd $1 && readlink -m $(git rev-parse --git-dir))"
+  local git_dir="$(cd $1 && cd `git rev-parse --git-dir` && pwd -P)"
  if [ -e "$git_dir/info/exclude" ] && ! $(grep -q "$project_design_dir" "$git_dir/info/exclude"); then
    echo "$project_design_dir" >> "$git_dir/info/exclude"
  fi