rbbt-util 5.26.97 → 5.26.98

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rbbt/hpc.rb +2 -2
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 19e2d3760c86a3a14044b46b95d43380190332270ec3047e620c1235df0ebdf8
4
- data.tar.gz: 929a4ff0a6fa72825b0e916e07ebd38f55d09dfd9bf4486cc069dd502d683033
3
+ metadata.gz: de9a740abeb4c1fbaa721fde9b7adc9a898cef03cb3b1c5072dc0232c95f9200
4
+ data.tar.gz: 8982a5a73092d3247e7865dbb4d616e7e0fead381ae6677f81e9060fb96e5f53
5
5
  SHA512:
6
- metadata.gz: 8afac300f9e35d72708e096c6ef878cf1573dac955ce5e85c1d9dd422c01fecbd78f9ea86ce19e65315b564cf1e510ddb5bb173be5f82d8003625d00b08ef949
7
- data.tar.gz: a1021842c668f85c4a759263e40720c603875bbce8de2db8b26160e35de9056a3ab768101e047b4e2fc58222b1470593e84ac23a6e00ab713637183b10210264
6
+ metadata.gz: 8233b0e24b7cb607e2d12dd417efe92ab8a311b7a2f46c85fe92282e25cb78dcb0142162c9e1089d546c1b8eefaadc25ed6ffcd40ef17366a6f17e894093929a
7
+ data.tar.gz: b33750c798296b28a8184f1c3bd1c126a601f3578913377de43cb07a04bb28e6d5a10aefa89c6e6ba9c2a79188adf242d451013e9d6d3f91002f159f3c63e7a9
data/lib/rbbt/hpc.rb CHANGED
@@ -19,6 +19,7 @@ module Marenostrum
19
19
  contain = options.delete :contain
20
20
  sync = options.delete :sync
21
21
  contain_and_sync = options.delete :contain_and_sync
22
+ group = options.delete :user_group
22
23
  wipe_container = options.delete :wipe_container
23
24
  copy_image = options.delete :copy_image
24
25
  exclusive = options.delete :exclusive
@@ -141,7 +142,7 @@ mkdir -p "$SINGULARITY_RUBY_INLINE"
141
142
 
142
143
  if contain
143
144
  user = ENV['USER'] || `whoami`.strip
144
- group = File.basename(File.dirname(ENV['HOME']))
145
+ group = File.basename(File.dirname(ENV['HOME'])) if group.nil?
145
146
  scratch_group_dir = File.join('/gpfs/scratch/', group)
146
147
  projects_group_dir = File.join('/gpfs/projects/', group)
147
148
 
@@ -169,7 +170,6 @@ echo "group_projects: $CONTAINER_DIR/projects/{PKGDIR}/{TOPLEVEL}/{SUBPATH}" >>
169
170
  echo "group_scratch: $CONTAINER_DIR/scratch/{PKGDIR}/{TOPLEVEL}/{SUBPATH}" >> $CONTAINER_DIR/.rbbt/etc/search_paths
170
171
  echo "user_projects: $CONTAINER_DIR/projects/#{user}/{PKGDIR}/{TOPLEVEL}/{SUBPATH}" >> $CONTAINER_DIR/.rbbt/etc/search_paths
171
172
  echo "user_scratch: $CONTAINER_DIR/scratch/#{user}/{PKGDIR}/{TOPLEVEL}/{SUBPATH}" >> $CONTAINER_DIR/.rbbt/etc/search_paths
172
- echo "$CONTAINER_DIR/projects/rbbt/workflows/" > $CONTAINER_DIR/.rbbt/etc/workflow_dir
173
173
 
174
174
  [[ -a "$CONTAINER_DIR/projects" ]] || ln -s '#{projects_group_dir}' "$CONTAINER_DIR/projects"
175
175
  [[ -a "$CONTAINER_DIR/scratch" ]] || ln -s '#{scratch_group_dir}' "$CONTAINER_DIR/scratch"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.26.97
4
+ version: 5.26.98
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez