Skip to content

Commit c511d20

Browse files
committed
changes to scripts
1 parent aa3881d commit c511d20

File tree

4 files changed

+3
-19
lines changed

4 files changed

+3
-19
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"r.plot.useHttpgd": true,
1818
"r.rterm.linux": "/workspaces/r-dev-env/scripts/launch_r.sh",
1919
"r.rpath.linux": "/usr/bin/R",
20-
"terminal.integrated.env.linux": {
21-
"R_RPATH_LINUX": "${config:r.rpath.linux}"
22-
},
2320
"terminal.integrated.sendKeybindingsToShell": true,
2421
"svn.multipleFolders.enabled": true,
2522
"workbench.editorAssociations": {

scripts/allow_ptrace.so

15.3 KB
Binary file not shown.

scripts/launch_r.sh

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
#!/usr/bin/env bash
2-
# Preload helper for ptrace
3-
export LD_PRELOAD="$(dirname "$0")/allow_ptrace.so"
4-
5-
# VS Code sets the env var R_RPATH_LINUX to the path from r.rpath.linux
6-
if [ -n "${R_RPATH_LINUX:-}" ] && [ -x "$R_RPATH_LINUX" ]; then
7-
R_BINARY="$R_RPATH_LINUX"
8-
else
9-
R_BINARY="/usr/bin/R"
10-
fi
11-
12-
exec "$R_BINARY" "$@"
1+
#!/bin/bash
2+
export LD_PRELOAD=/workspaces/r-dev-env/scripts/allow_ptrace.so
3+
exec /usr/bin/R "$@"

scripts/localscript.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ fi
3939
# Run the main function
4040
local_script
4141

42-
# Remove the .vscode/settings.json file if it exists so that
43-
# it does not interfere with the devcontainer.json
44-
rm -f "$WORK_DIR/.vscode/settings.json"
45-
4642
# 1. Build the ptrace helper library
4743
gcc -shared -fPIC -o "$SCRIPTS_DIR/allow_ptrace.so" "$SCRIPTS_DIR/allow_ptrace.c"
4844

0 commit comments

Comments
 (0)