Verbiage: more of Uppercase Apptainer in comments and messages, less aka

Author: MontrealSergiy

BrainPortal/app/models/cluster_task.rb

@@ -1873,7 +1873,7 @@ def submit_cluster_job
 
   test $status -eq 0 && break # all is good
 
-  # Detect failed boot of apptainer container
+  # Detect failed boot of Apptainer container
   if ! grep -i 'FATAL.*container.*creation.*failed' #{science_stderr_basename} >/dev/null ; then
     break # move on, for any other error or even non zero successes
   fi
@@ -2353,7 +2353,7 @@ def use_apptainer_short_workdir?
   # is the raw scientific bash script.
   def apptainer_commands(command_script)
 
-    # Basename of the apptainer wrapper script
+    # Basename of the Apptainer wrapper script
     apptainer_wrapper_basename = ".apptainer.#{self.run_id}.sh"
 
     # Values we substitute in our script:
@@ -2416,7 +2416,7 @@ def apptainer_commands(command_script)
     # Wrap new HOME environment
     command_script = wrap_new_HOME(command_script, effect_workdir)
 
-    # Set apptainer command
+    # Set Apptainer command
     apptainer_commands = <<-APPTAINER_COMMANDS
 
 # Note to developers:
@@ -2435,7 +2435,7 @@ def apptainer_commands(command_script)
   apptainer_basename=""
 fi
 
-# Build a local wrapper script to run in a apptainer container
+# Build a local wrapper script to run in an Apptainer container
 cat << \"APPTAINERJOB\" > #{apptainer_wrapper_basename.bash_escape}
 #!/bin/bash
 
@@ -2515,7 +2515,7 @@ def apptainer_commands(command_script)
 # 4) we mount each (if any) of the root directories for local data providers
 # 5) we mount (if any) other fixed file system overlays
 # 6) we mount (if any) capture ext3 filesystems
-# 7) with -H we set the task's work directory as the apptainer $HOME directory
+# 7) with -H we set the task's work directory as the Apptainer $HOME directory
 #{apptainer_executable_name}                  \\
     $mode                                       \\
     #{container_exec_args}                      \\
@@ -2677,7 +2677,7 @@ def load_apptainer_image_from_repo #:nodoc:
         File.open(capfile,"w") do |fh|
           fh.write("=== Stdout ===\n#{out}\n=== Stderr ===\n#{err}\n=== ====== ===\n")
         end
-        cb_error "Cannot build apptainer image. Captured outputs are in #{capfile}"
+        cb_error "Cannot build Apptainer image. Captured outputs are in #{capfile}"
       end
     end
 

BrainPortal/app/models/sing_bindmount_data_provider.rb

@@ -118,7 +118,7 @@ def check_remote_config! #:nodoc:
     remote_cmd  = "cd #{self.real_remote_dir.to_s.bash_escape} && test -f #{APPTAINER_IMAGE_BASENAME} && echo OK-Exists"
     text        = self.remote_bash_this(remote_cmd)
     # The following check will also make sure the remote shell is clean!
-    cb_error "No installed apptainer image #{APPTAINER_IMAGE_BASENAME}, or remote shell is unclean" unless text =~ /\AOK-Exists\s*\z/
+    cb_error "No installed Apptainer image #{APPTAINER_IMAGE_BASENAME}, or remote shell is unclean" unless text =~ /\AOK-Exists\s*\z/
 
     # Check we have the remote filesystem file
     remote_cmd  = "test -f #{self.remote_dir.to_s.bash_escape} && echo OK-Exists"
@@ -127,14 +127,14 @@ def check_remote_config! #:nodoc:
     # Check we have Apptainer 1.1 or better
     remote_cmd = "(singularity --version 2>/dev/null || apptainer --version 2>/dev/null)"
     text       = self.remote_bash_this(remote_cmd)
-    cb_error "Can't find apptainer version number on remote host" unless text =~ /^((singularity|apptainer) version )?(\d+)\.(\d+)/
+    cb_error "Can't find Apptainer version number on remote host" unless text =~ /^((singularity|apptainer) version )?(\d+)\.(\d+)/
     _, _, tool, major, minor = Regexp.last_match.to_a
     major = major.to_i
     minor = minor.to_i
     if tool == 'singularity'
       cb_error "singularity version number on remote host is less than 3.7" if major  < 3 || (major == 3 && minor < 7)
     else # tool == 'apptainer'
-      cb_error "apptainer version number on remote host is less than 1.1"   if major  < 1 || (major == 1 && minor < 1)
+      cb_error "Apptainer version number on remote host is less than 1.1"   if major  < 1 || (major == 1 && minor < 1)
     end
 
     # Check that inside the container, the containerized path exists

BrainPortal/app/models/sing_squashfs_data_provider.rb

@@ -86,7 +86,7 @@ def apptainer_executable_name
     # also works if an old Singularity and uptodate Apptainer
     # todo loop over list of several candidate executables
     text       = self.remote_bash_this(remote_cmd)
-    cb_error "Can't find apptainer version number on remote host" unless text =~ /^((singularity|apptainer) version )?(\d+)\.(\d+)/
+    cb_error "Can't find Apptainer version number on remote host" unless text =~ /^((singularity|apptainer) version )?(\d+)\.(\d+)/
     _, _, @_tool, major, minor = Regexp.last_match.to_a
     major = major.to_i
     minor = minor.to_i

BrainPortal/app/views/data_providers/_dp_types_explained.html.erb

@@ -116,7 +116,7 @@ acts like a FlatDataProvider.
 
 <strong>SingSquashfsDataProvider</strong> This class connects to a set of
 one or several squashfs files (all named with <em>.squashfs</em> extensions) through
-a Apptainer (Sigularity container handler. The requirements are:<br>
+a Apptainer (Singularity) container handler. The requirements are:<br>
 <ul>
   <li>that all the squashfs files are in the <em>Physical Data Location</em>,
   <li>the Apptainer image is also there and named <em><%= SingSquashfsDataProvider::APPTAINER_IMAGE_BASENAME %></em>,

BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/singularity_image/singularity_image.rb

@@ -33,7 +33,7 @@ def self.file_name_pattern #:nodoc:
 
   def is_viewable? #:nodoc:
     if ! self.has_apptainer_support?
-      return [ "The local portal doesn't support inspecting Apptainer (aka Singularity) images." ]
+      return [ "The local portal doesn't support inspecting Apptainer (Singularity) images." ]
     elsif ! self.is_locally_synced?
       return [ "Apptainer (Singularity) image file not yet synchronized" ]
     else