From 2f3cdd728c6617b9fd6ccb2ed28f29fb97018c10 Mon Sep 17 00:00:00 2001 From: Marty Kandes <mkandes@sdsc.edu> Date: Thu, 22 Jul 2021 19:15:47 +0000 Subject: [PATCH] Include apt-get install yum-utils during installation for Ubuntu This is required to allow yum-based bootstraping of definition files. e.g., CentOS-based containers. Note, however, there are currently no deb packages for yum or yum-utils in the standard Ubuntu 20.04 LTS (focal) repositories. An alternative approach to installing either yum and/or dnf will be required in the future. Also fixed a typo of a missing colon on a call to the log::error function when naked-singularity.sh checks for a pre-existing installation of Singularity. --- README.md | 4 ++-- naked-singularity.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6f8a2c9..3fbcf7f 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ University of California, San Diego ## Version -1.7.2 +1.7.4 ## Last Updated -Sunday, June 20th, 2021 +Thursday, July 22nd, 2021 diff --git a/naked-singularity.sh b/naked-singularity.sh index 7d89af4..e54dabf 100755 --- a/naked-singularity.sh +++ b/naked-singularity.sh @@ -17,7 +17,7 @@ # # LAST UPDATED # -# Wednesday, June 16th, 2021 +# Thursday, July 22nd, 2021 # # ---------------------------------------------------------------------- @@ -75,7 +75,7 @@ naked::install() { log::output 'Checking if Singularity is already installed ...' singularity --version > /dev/null 2>&1 if [[ "${?}" -eq 0 ]]; then - log:error "Singularity is installed: $(singularity --version)" + log::error "Singularity is installed: $(singularity --version)" return 1 else log::output 'Singularity is not installed.' @@ -152,6 +152,7 @@ naked::install() { apt-get -y install git apt-get -y install cryptsetup-bin apt-get -y install debootstrap + apt-get -y install yum-utils else -- GitLab