put the directories directly in home

nesi · Apr 9, 2024 · df5e9af · df5e9af
1 parent a1d5de5
commit df5e9af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/submit.yml.erb b/submit.yml.erb
@@ -17,7 +17,7 @@ script:
   native:
     container:
       name: "intermshell"
-      image: "ghcr.io/nesi/training-environment-jupyter-intermediate-shell-app:v0.3.2"
+      image: "ghcr.io/nesi/training-environment-jupyter-intermediate-shell-app:v0.3.3"
       command: ["/bin/bash","-l","<%= staged_root %>/job_script_content.sh"]
       working_dir: "<%= Etc.getpwnam(ENV['USER']).dir %>"
       restart_policy: 'OnFailure'
@@ -56,7 +56,7 @@ script:
             c.ServerApp.port_retries = 0
             c.ServerApp.open_browser = False
             c.ServerApp.allow_origin = '*'
-            c.ServerApp.root_dir = '<%= user.home %>/shell4b'
+            c.ServerApp.root_dir = '<%= user.home %>'
             c.ServerApp.disable_check_xsrf = True
           mount_path: '/ood'
     init_containers:

diff --git a/template/script.sh.erb b/template/script.sh.erb
@@ -18,9 +18,8 @@ set -x
 # copy data files
 # note: this will not overwrite files if they already exist, so changes won't
 #       be lost when restarting the app
-mkdir -p ~/shell4b
-rsync --ignore-existing -avz /var/lib/puzzles_da/ ~/shell4b/puzzles_da/
-rsync --ignore-existing -avz /var/lib/shell4b_data/ ~/shell4b/shell4b_data/
+rsync --ignore-existing -avz /var/lib/puzzles_da/ ~/puzzles_da/
+rsync --ignore-existing -avz /var/lib/shell4b_data/ ~/shell4b_data/
 
 # launch JupyterLab
 jupyter lab --config="/ood/ondemand_config.py"