Updated version 7.3.0

pscedu · Dec 28, 2024 · d34f2d1 · d34f2d1
1 parent b5fb0d2
commit d34f2d1
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 8 deletions.
diff --git a/7.3.0/Singularity b/7.3.0/Singularity
@@ -6,11 +6,14 @@ From: gnuoctave/octave:7.3.0
     EMAIL [email protected]
     SUPPORT [email protected]
     WEBSITE http://github.com/pscedu/singularity-octave
-    COPYRIGHT Copyright © 2022, Pittsburgh Supercomputing Center. All Rights Reserved.
+    COPYRIGHT Copyright © 2024, Pittsburgh Supercomputing Center. All Rights Reserved.
     VERSION 7.3.0
 
 %post
     apt-get update
     apt-get install -y gnuplot pandoc vim imagemagick ffmpeg
     apt-get clean
     apt-get autoclean
+
+%runscript
+    octave-cli "$@"
diff --git a/7.3.0/build.sh b/7.3.0/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 IMAGE=singularity-octave-7.3.0.sif

diff --git a/7.3.0/ffmpeg b/7.3.0/ffmpeg
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright © 2024 Pittsburgh Supercomputing Center.
+# All Rights Reserved.
+
+VERSION=7.3.0
+PACKAGE=octave
+TOOL=ffmpeg
+DIRECTORY=$(dirname "$0")
+
+STORAGES=(/ocean /bil /hive /local)
+
+OPTIONS=""
+for STORAGE in "${STORAGES[@]}"
+do
+  	if [ -d "$STORAGE" ]; then
+                OPTIONS=$OPTIONS" -B $STORAGE"
+        fi
+done
+
+singularity exec $OPTIONS $DIRECTORY/singularity-$PACKAGE-$VERSION.sif octave -W "$@"
diff --git a/7.3.0/gnuplot b/7.3.0/gnuplot
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 VERSION=7.3.0
@@ -13,9 +13,17 @@ STORAGES=(/ocean /bil /hive /local)
 OPTIONS=""
 for STORAGE in "${STORAGES[@]}"
 do
-  	if [ -d "$STORAGE" ]; then
+        if [ -d "$STORAGE" ]; then
                 OPTIONS=$OPTIONS" -B $STORAGE"
         fi
 done
 
+if id | grep -q hubmap && [ -d "/hive" ]; then
+        OPTIONS=$OPTIONS" -B /hive"
+fi
+
+if id | grep -q bil && [ -d "/bil" ]; then
+        OPTIONS=$OPTIONS" -B /bil"
+fi
+
 singularity exec $OPTIONS $DIRECTORY/singularity-$PACKAGE-$VERSION.sif $TOOL "$@"
diff --git a/7.3.0/modulefile.lua b/7.3.0/modulefile.lua
@@ -26,6 +26,7 @@ To unload the module type
 Tools included in this module are
 
 * octave-cli
+* octave
 * gnuplot
 * pandoc
 

diff --git a/7.3.0/octave b/7.3.0/octave
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 VERSION=7.3.0

diff --git a/7.3.0/octave-cli b/7.3.0/octave-cli
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 VERSION=7.3.0

diff --git a/7.3.0/pandoc b/7.3.0/pandoc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 VERSION=7.3.0

diff --git a/7.3.0/rbuild.sh b/7.3.0/rbuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright © 2022 Pittsburgh Supercomputing Center.
+# Copyright © 2024 Pittsburgh Supercomputing Center.
 # All Rights Reserved.
 
 IMAGE=singularity-octave-7.3.0.sif

diff --git a/7.3.0/vim b/7.3.0/vim
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright © 2024 Pittsburgh Supercomputing Center.
+# All Rights Reserved.
+
+VERSION=7.3.0
+PACKAGE=octave
+TOOL=vim
+DIRECTORY=$(dirname "$0")
+
+STORAGES=(/ocean /bil /hive /local)
+
+OPTIONS=""
+for STORAGE in "${STORAGES[@]}"
+do
+  	if [ -d "$STORAGE" ]; then
+                OPTIONS=$OPTIONS" -B $STORAGE"
+        fi
+done
+
+singularity exec $OPTIONS $DIRECTORY/singularity-$PACKAGE-$VERSION.sif octave -W "$@"