From 37e307e8cde4009950b1feb8a53d33fb3b1fa571 Mon Sep 17 00:00:00 2001
From: Ben Bergen <bergen@lanl.gov>
Date: Wed, 13 May 2020 12:02:38 -0600
Subject: Added alias and bash completion for spacktivate (#16472)

---
 share/spack/bash/spack-completion.in | 7 +++++++
 share/spack/setup-env.csh            | 1 +
 share/spack/setup-env.sh             | 2 ++
 share/spack/spack-completion.bash    | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/share/spack/bash/spack-completion.in b/share/spack/bash/spack-completion.in
index 164fc5c5b3..80ba94ed87 100755
--- a/share/spack/bash/spack-completion.in
+++ b/share/spack/bash/spack-completion.in
@@ -304,6 +304,13 @@ _pretty_print() {
 
 complete -o bashdefault -o default -F _bash_completion_spack spack
 
+# Completion for spacktivate
+complete -o bashdefault -o default -F _bash_completion_spack spacktivate
+
+_spacktivate() {
+  _spack_env_activate
+}
+
 # Spack commands
 #
 # Everything below here is auto-generated.
diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh
index 67357c94e4..edbf51e8e2 100755
--- a/share/spack/setup-env.csh
+++ b/share/spack/setup-env.csh
@@ -18,6 +18,7 @@ if ($?SPACK_ROOT) then
 
     # Command aliases point at separate source files
     alias spack          'set _sp_args = (\!*); source $_spack_share_dir/csh/spack.csh'
+    alias spacktivate    'spack env activate'
     alias _spack_pathadd 'set _pa_args = (\!*) && source $_spack_share_dir/csh/pathadd.csh'
 
     # Set variables needed by this script
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index d3aed61d1a..032247cd8f 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -242,6 +242,8 @@ if [ "$_sp_shell" = bash ]; then
     export -f spack
 fi
 
+alias spacktivate="spack env activate"
+
 #
 # Figure out where this file is.
 #
diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index 9017f4fe57..b7b45fb0d7 100755
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -304,6 +304,13 @@ _pretty_print() {
 
 complete -o bashdefault -o default -F _bash_completion_spack spack
 
+# Completion for spacktivate
+complete -o bashdefault -o default -F _bash_completion_spack spacktivate
+
+_spacktivate() {
+  _spack_env_activate
+}
+
 # Spack commands
 #
 # Everything below here is auto-generated.
-- 
cgit v1.2.3-70-g09d2