From 3383cdd5d10f66962f5ca39f2b80cf4049ecd5c8 Mon Sep 17 00:00:00 2001 From: icaoberg Date: Sat, 16 Dec 2023 03:03:26 -0500 Subject: [PATCH 1/5] Update copyright year to 2023 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59ecc6f..506d385 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,6 @@ bash ./test.sh ``` --- -Copyright © 2020-2021 Pittsburgh Supercomputing Center. All Rights Reserved. +Copyright © 2020-2023 Pittsburgh Supercomputing Center. All Rights Reserved. The [Biomedical Applications Group](https://www.psc.edu/biomedical-applications/) at the [Pittsburgh Supercomputing Center](http://www.psc.edu) in the [Mellon College of Science](https://www.cmu.edu/mcs/) at [Carnegie Mellon University](http://www.cmu.edu). From 68373faa5861c73bae9bbdbd8af35867085cf7b4 Mon Sep 17 00:00:00 2001 From: icaoberg Date: Sat, 16 Dec 2023 03:07:58 -0500 Subject: [PATCH 2/5] Added version 5.4.10 --- 5.4.10/Dockerfile | 10 ++++++++++ 5.4.10/Singularity | 16 ++++++++++++++++ 5.4.10/build.sh | 19 +++++++++++++++++++ 5.4.10/dbuild.sh | 6 ++++++ 5.4.10/gnuplot | 18 ++++++++++++++++++ 5.4.10/modulefile.lua | 40 ++++++++++++++++++++++++++++++++++++++++ 5.4.10/rbuild.sh | 19 +++++++++++++++++++ 5.4.10/test.sh | 3 +++ 8 files changed, 131 insertions(+) create mode 100644 5.4.10/Dockerfile create mode 100644 5.4.10/Singularity create mode 100755 5.4.10/build.sh create mode 100755 5.4.10/dbuild.sh create mode 100755 5.4.10/gnuplot create mode 100644 5.4.10/modulefile.lua create mode 100755 5.4.10/rbuild.sh create mode 100755 5.4.10/test.sh diff --git a/5.4.10/Dockerfile b/5.4.10/Dockerfile new file mode 100644 index 0000000..f1e1809 --- /dev/null +++ b/5.4.10/Dockerfile @@ -0,0 +1,10 @@ +FROM alpine:edge + +LABEL "MAINTAINER"="icaoberg" +LABEL "EMAIL"="icaoberg@psc.edu" +LABEL "SUPPORT"="help@psc.edu" +LABEL "REPOSITORY"="http://github.com/pscedu/singularity-gnuplot" +LABEL "COPYRIGHT"="Copyright © 2021-2023 Pittsburgh Supercomputing Center. All Rights Reserved." +LABEL "VERSION"="5.4.10" + +RUN apk add --update gnuplot diff --git a/5.4.10/Singularity b/5.4.10/Singularity new file mode 100644 index 0000000..92271f6 --- /dev/null +++ b/5.4.10/Singularity @@ -0,0 +1,16 @@ +Bootstrap: docker +From: alpine:edge + +%labels + AUTHOR icaoberg + EMAIL icaoberg@psc.edu + SUPPORT help@psc.edu + WEBSITE http://github.com/icaoberg/singularity-gnuplot + COPYRIGHT Copyright © 2021-2023 Pittsburgh Supercomputing Center. All Rights Reserved. + VERSION 5.4.10-patch-level-1 + +%post + apk add --update gnuplot + +%runscript + gnuplot "$@" diff --git a/5.4.10/build.sh b/5.4.10/build.sh new file mode 100755 index 0000000..ec1b20a --- /dev/null +++ b/5.4.10/build.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Copyright © 2021-2023 Pittsburgh Supercomputing Center. +# All Rights Reserved. + +IMAGE=singularity-gnuplot-5.4.10.sif +DEFINITION=Singularity + +if [ -f $IMAGE ]; then + rm -fv $IMAGE +fi + +sudo singularity build $IMAGE $DEFINITION + +if [ -f $IMAGE ]; then + exit 0 +else + exit 1 +fi diff --git a/5.4.10/dbuild.sh b/5.4.10/dbuild.sh new file mode 100755 index 0000000..8a640d5 --- /dev/null +++ b/5.4.10/dbuild.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Copyright © 2021-2023 Pittsburgh Supercomputing Center. +# All Rights Reserved. + +docker build -t icaoberg/gnuplot:5.4.10 . diff --git a/5.4.10/gnuplot b/5.4.10/gnuplot new file mode 100755 index 0000000..ce30cdd --- /dev/null +++ b/5.4.10/gnuplot @@ -0,0 +1,18 @@ +#!/bin/bash + +VERSION=5.4.10 +PACKAGE=gnuplot +TOOL=gnuplot +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 $TOOL "$@" diff --git a/5.4.10/modulefile.lua b/5.4.10/modulefile.lua new file mode 100644 index 0000000..e3b0a03 --- /dev/null +++ b/5.4.10/modulefile.lua @@ -0,0 +1,40 @@ +-- +-- gnuplot 5.4.10 modulefile +-- +-- "URL: https://www.psc.edu/resources/software" +-- "Category: Other" +-- "Description: gnuplot is a command-line and GUI program that can generate two- and three-dimensional plots of functions, data, and data fits." +-- "Keywords: singularity utilities" + +whatis("Name: gnuplot") +whatis("Version: 5.4.10") +whatis("Category: Other") +whatis("URL: https://www.psc.edu/resources/software") +whatis("Description: gnuplot is a command-line and GUI program that can generate two- and three-dimensional plots of functions, data, and data fits.") + +help([[ +gnuplot is a command-line and GUI program that can generate two- and three-dimensional plots of functions, data, and data fits. + +To load the module type + +> module load gnuplot/5.4.10 + +To unload the module type + +> module unload gnuplot/5.4.10 + +Documentation +------------- +For help, type + +> gnuplot --help + +Tools included in this module are + +* gnuplot +]]) + +local package = "gnuplot" +local version = "5.4.10" +local base = pathJoin("/opt/packages",package,version) +prepend_path("PATH", base) diff --git a/5.4.10/rbuild.sh b/5.4.10/rbuild.sh new file mode 100755 index 0000000..c0d60d8 --- /dev/null +++ b/5.4.10/rbuild.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Copyright © 2021-2023 Pittsburgh Supercomputing Center. +# All Rights Reserved. + +IMAGE=singularity-gnuplot-5.4.10.sif +DEFINITION=Singularity + +if [ -f $IMAGE ]; then + rm -fv $IMAGE +fi + +singularity build --remote $IMAGE $DEFINITION + +if [ -f $IMAGE ]; then + exit 0 +else + exit 1 +fi diff --git a/5.4.10/test.sh b/5.4.10/test.sh new file mode 100755 index 0000000..50bfbf0 --- /dev/null +++ b/5.4.10/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +./singularity-gnuplot-5.4.10.sif --help From f506ee386279188853b594585f38be68ec6764f3 Mon Sep 17 00:00:00 2001 From: icaoberg Date: Sat, 16 Dec 2023 03:11:46 -0500 Subject: [PATCH 3/5] Refactor GitHub workflows. Update runs-on parameter to use `ubuntu-latest` instead of `ubuntu-18.04`. --- .github/workflows/main.yml | 2 +- .github/workflows/pretty.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edb4091..3ad5d43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: build: name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: singularity_version: diff --git a/.github/workflows/pretty.yml b/.github/workflows/pretty.yml index be689d4..0914987 100644 --- a/.github/workflows/pretty.yml +++ b/.github/workflows/pretty.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: build: name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v2 From dec305727ea6e71873e9514114a40717587f787f Mon Sep 17 00:00:00 2001 From: icaoberg Date: Sat, 16 Dec 2023 03:16:39 -0500 Subject: [PATCH 4/5] Fixed typo --- 5.4.10/Singularity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5.4.10/Singularity b/5.4.10/Singularity index 92271f6..fde16f5 100644 --- a/5.4.10/Singularity +++ b/5.4.10/Singularity @@ -7,7 +7,7 @@ From: alpine:edge SUPPORT help@psc.edu WEBSITE http://github.com/icaoberg/singularity-gnuplot COPYRIGHT Copyright © 2021-2023 Pittsburgh Supercomputing Center. All Rights Reserved. - VERSION 5.4.10-patch-level-1 + VERSION 5.4-patch-level-10 %post apk add --update gnuplot From 47fe98d163da3bce074f706161504f4b46139453 Mon Sep 17 00:00:00 2001 From: icaoberg Date: Sat, 16 Dec 2023 03:18:04 -0500 Subject: [PATCH 5/5] Added ignore files --- 5.4.5/.ignore | 0 5.4.6/.ignore | 0 5.4/.ignore | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 5.4.5/.ignore create mode 100644 5.4.6/.ignore create mode 100644 5.4/.ignore diff --git a/5.4.5/.ignore b/5.4.5/.ignore new file mode 100644 index 0000000..e69de29 diff --git a/5.4.6/.ignore b/5.4.6/.ignore new file mode 100644 index 0000000..e69de29 diff --git a/5.4/.ignore b/5.4/.ignore new file mode 100644 index 0000000..e69de29