From 80ac61339164ac8044fafb641403384cb54ae3e7 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <christoph.junghans@gmail.com>
Date: Tue, 12 Sep 2017 13:17:20 -0600
Subject: Shell detection: filter preceding "-"

On OSX, the shell detection code may get a preceding dash, like
"-bash". This adds a filter to remove it.
---
 share/spack/setup-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index 8cf54661d8..74820ecb93 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -202,7 +202,7 @@ export SPACK_ROOT=${_sp_prefix}
 # Determine which shell is being used
 #
 function _spack_determine_shell() {
-	ps -p $$ | tail -n 1 | awk '{print $4}' | xargs basename
+	ps -p $$ | tail -n 1 | awk '{print $4}' | sed 's/^-//' | xargs basename
 }
 export SPACK_SHELL=$(_spack_determine_shell)
 
-- 
cgit v1.2.3-70-g09d2