Update code.sh to use new VSCode shell profiles for integrated terminal.

owtaylor · Mar 9, 2022 · 39e3881 · 39e3881
1 parent 43662e7
commit 39e3881
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/code.sh b/code.sh
@@ -383,16 +383,21 @@ if $toolbox_reset_configuration || [ ! -f $settings ] ; then
 {
   "remote.containers.copyGitConfig": false,
   "remote.containers.gitCredentialHelperConfigLocation": "none",
-  "terminal.integrated.shell.linux": "/usr/sbin/capsh",
-  "terminal.integrated.shellArgs.linux": [
-    "--caps=",
-    "--",
-    "-c",
-    "exec \"\$@\"",
-    "/bin/sh",
-    "$SHELL",
-    "-l"
-  ]
+  "terminal.integrated.defaultProfile.linux": "toolbox",
+  "terminal.integrated.profiles.linux": {
+    "toolbox": {
+      "path": "/usr/sbin/capsh",
+      "args": [
+        "--caps=",
+        "--",
+        "-c",
+        "exec \"\$@\"",
+        "/bin/sh",
+        "$SHELL",
+        "-l"
+      ]
+    }
+  }
 }
 EOF
 fi

diff --git a/tests/test-basic.sh b/tests/test-basic.sh
@@ -26,16 +26,21 @@ EOF
 {
   "remote.containers.copyGitConfig": false,
   "remote.containers.gitCredentialHelperConfigLocation": "none",
-  "terminal.integrated.shell.linux": "/usr/sbin/capsh",
-  "terminal.integrated.shellArgs.linux": [
-    "--caps=",
-    "--",
-    "-c",
-    "exec \"$@\"",
-    "/bin/sh",
-    "/bin/bash",
-    "-l"
-  ]
+  "terminal.integrated.defaultProfile.linux": "toolbox",
+  "terminal.integrated.profiles.linux": {
+    "toolbox": {
+      "path": "/usr/sbin/capsh",
+      "args": [
+        "--caps=",
+        "--",
+        "-c",
+        "exec \"$@\"",
+        "/bin/sh",
+        "/bin/bash",
+        "-l"
+      ]
+    }
+  }
 }
 EOF