fish shell compatibility

beledouxdenis · Jul 13, 2015 · 2abfe00 · 2abfe00
1 parent 0b45471
commit 2abfe00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Terminal.sh b/Terminal.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-CD_CMD="cd "\\\"$(pwd)\\\""; clear"
+CD_CMD="cd "\\\"$(pwd)\\\"" && clear"
+if echo "$SHELL" | grep -E "/fish$" &> /dev/null; then
+  CD_CMD="cd "\\\"$(pwd)\\\""; and clear"
+fi
 VERSION=$(sw_vers -productVersion)
 if (( $(expr $VERSION '<' 10.7.0) )); then
 	IN_WINDOW="in window 1"

diff --git a/iTerm.sh b/iTerm.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 CD_CMD="cd "\\\"$(pwd)\\\"" && clear"
+if echo "$SHELL" | grep -E "/fish$" &> /dev/null; then
+  CD_CMD="cd "\\\"$(pwd)\\\""; and clear"
+fi
 VERSION=$(sw_vers -productVersion)
 
 if (( $(expr $VERSION '<' 10.7) )); then