fixes to activate

* not in project workspace settings * lab_launch is a failsafe if the sed doesn't work * disable secondary activate from python extension
anaconda · Aug 7, 2020 · 4eeeda7 · 4eeeda7
1 parent ee922a3
commit 4eeeda7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/start_vscode.sh b/start_vscode.sh
@@ -23,7 +23,7 @@ echo "|---"
 sed 's@^@|  @' $OCV/project.code-workspace
 echo "|---"
 
-sed -E -i 's@CONDA_DESIRED_ENV@"$CONDA_DESIRED_ENV"@' $OCV/activate-env-spec.sh
+sed -E -i 's@lab_launch@'"$CONDA_DESIRED_ENV"'@' $OCV/activate-env-spec.sh
 
 python /opt/continuum/scripts/merge_vscode_settings.py $SETTINGS
 

diff --git a/vscode/activate-env-spec.sh b/vscode/activate-env-spec.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 source ~/.bashrc
-conda activate CONDA_DESIRED_ENV
+conda activate lab_launch
diff --git a/vscode/admin_settings.json b/vscode/admin_settings.json
@@ -8,5 +8,7 @@
   "extensions.ignoreRecommendations": true,
   "extensions.showRecommendationsOnlyOnDemand": true,
   "workbench.startupEditor": "none",
-  "terminal.integrated.inheritEnv": false
+  "terminal.integrated.inheritEnv": false,
+  "terminal.integrated.shellArgs.linux": ["--init-file", "activate-env-spec.sh"],
+  "python.terminal.activateEnvironment": false
 }
diff --git a/vscode/project.code-workspace b/vscode/project.code-workspace
@@ -7,7 +7,5 @@
   "settings":
     {
       "python.pythonPath": "/opt/continuum/anaconda/envs/anaconda50_py36/bin/python",
-      "terminal.integrated.shellArgs.linux": ["--init-file", "activate-env-spec.sh"],
-      "python.terminal.activateEnvironment": false
     }
 }