Improve error message for forgetting to use source with activate and …

…deactivate

Fixes conda#601.

bin/activate

@@ -3,6 +3,9 @@
 # Ensure that this script is sourced, not executed
 # Note that if the script was executed, we're running inside bash!
 if [[ -n $BASH_VERSION ]] && [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+    >&2 echo "Error: activate must be sourced. Run 'source activate envname'
+instead of 'activate envname'.
+"
     "$(dirname "$0")/conda" ..activate -h
     exit 1
 fi

bin/deactivate

@@ -3,6 +3,9 @@
 # Ensure that this script is sourced, not executed
 # Note that if the script was executed, we're running inside bash!
 if [[ -n $BASH_VERSION ]] && [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+    >&2 echo "Error: deactivate must be sourced. Run 'source deactivate'
+instead of 'deactivate'.
+"
     "$(dirname $0)/conda" ..deactivate -h
     exit 1
 fi

tests/test_activate.py

@@ -206,6 +206,7 @@ def test_activate_help():
 
             stdout, stderr = run_in(commands, shell)
             assert stdout == ''
+            assert "activate must be sourced" in stderr
             assert "Usage: source activate ENV" in stderr
 
             commands = (command_setup + """
@@ -222,6 +223,7 @@ def test_activate_help():
 
             stdout, stderr = run_in(commands, shell)
             assert stdout == ''
+            assert "deactivate must be sourced" in stderr
             assert "Usage: source deactivate" in stderr
 
             commands = (command_setup + """