Merge remote-tracking branch 'origin/devel' into docs/229-codespace-management

Author: avinab-neogy

.devcontainer/devcontainer.json

@@ -1,12 +1,28 @@
 {
     "name": "R-Dev-Env",
     "image": "ghcr.io/r-devel/r-dev-env:devel",
+    "remoteUser": "vscode",
     "hostRequirements": {
         "cpus": 4
     },
     "customizations": {
         "vscode": {
             "settings": {
+                "git.ignoredRepositories": ["."],
+                  "files.exclude": {
+                       "**/.vscode": true,
+                       "**/.devcontainer": true,
+                       "**/.git": true,
+                       "**/.github": true,
+                       "**/.gitignore": true,
+                       "**/.gitpod.Dockerfile": true,
+                       "**/.gitpod.yml": true,
+                       "**/.markdownlint-cli2.yaml": true,
+                       "**/.pre-commit-config.yaml": true,
+                       "**/Dockerfile": true,
+                       "**/mkdocs.yml": true,
+                       "**/scripts": true
+  },
                 "editor.tabSize": 8,
                 "editor.indentSize": 4,
                 "editor.detectIndentation": false,
@@ -19,16 +35,18 @@
                 "workbench.editorAssociations": {
                     "*.md": "vscode.markdown.preview.editor"
                 },
-                "workbench.welcomePage.walkthroughs.openOnInstall": false
+                "workbench.welcomePage.walkthroughs.openOnInstall": false,
+                "r.libPaths": ["/usr/local/lib/R/site-library"]
             },
             "extensions": [
                 "REditorSupport.r",
                 "mads-hartmann.bash-ide-vscode",
                 "johnstoncode.svn-scm",
                 "ms-vscode.cpptools",
-                "MS-vsliveshare.vsliveshare"
+                "MS-vsliveshare.vsliveshare",
+                "natqe.reload"
             ]
         }
     },
-    "postCreateCommand": "find . -wholename '*.git*'  -type d -prune -o -type f -exec chown vscode:vscode {} \\; && sh /workspaces/r-dev-env/scripts/localscript.sh"
+    "postCreateCommand": "sh /workspaces/r-dev-env/scripts/localscript.sh"
 }

.gitignore

@@ -5,3 +5,4 @@ R-devel.tar.gz
 /venv
 .cache/
 .Rproj.user
+.vscode/

Dockerfile

@@ -30,3 +30,5 @@ RUN Rscript -e "runiverse <- sprintf('r-universe.dev/bin/linux/%s-%s/%s/', \
 # Define env var used in GitHub Actions that build and deploy container
 ARG CONTAINER_VERSION
 ENV CONTAINER_VERSION=${CONTAINER_VERSION}
+
+USER vscode

docs/tutorials/contribution_workflow.md

@@ -67,7 +67,9 @@ make
   may skip this step while you are iterating on a bug fix or other development,
   until you are ready to [create a patch](./patch_update.md).
 
-- To use the re-built R, simply open a new R terminal.
+- To use the re-built R, simply open a new R terminal. If you have made changes
+  to the help files, click "Reload" in the VS Code status bar (bottom right) to
+  reload your VS Code window.
 
 #### 4. Cross check and Re-running Code
 

reinstall-cmake.sh

@@ -25,7 +25,7 @@ cat $WORK_DIR/scripts/welcome_msg.sh >> ~/.bashrc
 #bash ~/.bashrc
 
 # Remove git directory if it exists
-rm -rf .git
+#rm -rf .git
 
 # copying vscode extension settings from devcontainer json to vscode settings json using jq
 if [ -f "$DEVCONTAINER_JSON" ]; then

scripts/localscript.sh

@@ -29,7 +29,7 @@ Have fun \U0001F601
 "
 
 # open INDEX.md if INIT file exists
-if [ -f "INIT" ]; then
+if [ ! -d "svn" ] && [ ! -d "build" ]; then
     sleep 2
     code INDEX.md
     rm INIT

scripts/welcome_msg.sh

@@ -60,8 +60,9 @@ 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')
+  updated_settings_data=$(cat "$settings_file_path" | jq --arg subdir "$selected_version" '."r.rterm.linux"=$subdir | ."r.rpath.linux"=$subdir')
   echo "$updated_settings_data" > "$settings_file_path"
 
   echo "R terminal will now use version: $selected_version"
+  echo "To update the HTML help, click \"Reload\" in the VS Code status bar (bottom right) to reload your VS Code window."
 }