Refactor debugging setup: use wrapper env var and update which_r for rpath

Author: avinab-neogy

.devcontainer/devcontainer.json

@@ -16,7 +16,10 @@
                 "r.lsp.diagnostics": false,
                 "r.plot.useHttpgd": true,
                 "r.rterm.linux": "/workspaces/r-dev-env/scripts/launch_r.sh",
-                "r.rpath.linux": "/workspaces/r-dev-env/build/r-devel/bin/R",
+                "r.rpath.linux": "/usr/bin/R",
+                "terminal.integrated.env.linux": {
+                    "R_RPATH_LINUX": "${config:r.rpath.linux}"
+                },
                 "terminal.integrated.sendKeybindingsToShell": true,
                 "svn.multipleFolders.enabled": true,
                 "workbench.editorAssociations": {
@@ -36,5 +39,5 @@
             ]
         }
     },
-    "postCreateCommand": "find . -wholename '.git*' -type d -prune -o -type f -exec chown vscode:vscode {} \\; && \\\n  gcc -shared -fPIC -o /workspaces/r-dev-env/scripts/allow_ptrace.so /workspaces/r-dev-env/scripts/allow_ptrace.c && \\\n  chmod +x /workspaces/r-dev-env/scripts/launch_r.sh && \\\n  sh /workspaces/r-dev-env/scripts/localscript.sh"
-}
+"postCreateCommand": "find . -wholename '.git*' -type d -prune -o -type f -exec chown vscode:vscode {} \\; && sh ./scripts/localscript.sh"
+}

scripts/localscript.sh

@@ -9,18 +9,19 @@ local_script(){
 WORK_DIR=$PWD
 VSCODE_DIR="$WORK_DIR/.vscode"
 DEVCONTAINER_JSON="$WORK_DIR/.devcontainer/devcontainer.json"
+SCRIPTS_DIR="$WORK_DIR/scripts"
 
 # Create patch directory in workspace root ($PWD at start)
 PATCHDIR="$WORK_DIR/patches"
 mkdir -p $PATCHDIR
 mkdir -p $VSCODE_DIR
 
 # Copy the which_r and set_build_r function definitions to .bashrc
-cat $WORK_DIR/scripts/which_r.sh >> ~/.bashrc
-cat $WORK_DIR/scripts/set_build_r.sh >> ~/.bashrc
+cat $SCRIPTS_DIR/which_r.sh >> ~/.bashrc
+cat $SCRIPTS_DIR/set_build_r.sh >> ~/.bashrc
 
 # Copy over the welcome message script to be run when bash terminal starts
-cat $WORK_DIR/scripts/welcome_msg.sh >> ~/.bashrc
+cat $SCRIPTS_DIR/welcome_msg.sh >> ~/.bashrc
 
 #bash ~/.bashrc
 
@@ -41,4 +42,10 @@ local_script
 
 # Remove the .vscode/settings.json file if it exists so that
 # it does not interfere with the devcontainer.json
-rm -f .vscode/settings.json
+rm -f "$WORK_DIR/.vscode/settings.json"
+
+# 1. Build the ptrace helper library
+gcc -shared -fPIC -o "$SCRIPTS_DIR/allow_ptrace.so" "$SCRIPTS_DIR/allow_ptrace.c"
+
+# 2. Mark the wrapper executable
+chmod +x "$SCRIPTS_DIR/launch_r.sh"

scripts/which_r.sh

@@ -60,7 +60,7 @@ which_r() {
   fi
 
   # Update settings.json with the chosen R path
-  updated_settings_data=$(cat "$settings_file_path" | jq --arg subdir "$selected_version" '."r.rterm.linux"=$subdir | ."r.rpath.linux"=$subdir')
+  updated_settings_data=$(cat "$settings_file_path" | jq --arg subdir "$selected_version" '."r.rpath.linux"=$subdir')
   echo "$updated_settings_data" > "$settings_file_path"
 
   echo "R terminal will now use version: $selected_version"