Don't exit on package installation failure

.atom-build.yml

@@ -3,13 +3,11 @@ name: ''
 targets:
   # Fedora
   Run silently in Fedora:
-    cmd: 'buildWrapper podmanRunEasy -m ephemeral -i fedora:latest -n installJRMC -w {FILE_ACTIVE_PATH} --silent --mkexec --systemd {FILE_ACTIVE}'
+    cmd: 'podmanRun -o "--rm --name=installJRMC_{FILE_ACTIVE_NAME_BASE} -v={FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}:z -w {FILE_ACTIVE_PATH} fedora:latest {FILE_ACTIVE}'
   Run debug in Fedora:
-    cmd: 'buildWrapper podmanRunEasy -m ephemeral -i fedora:latest -n installJRMC -w {FILE_ACTIVE_PATH} --debug --mkexec --systemd {FILE_ACTIVE}'
+    cmd: 'podmanRun -o "--rm --name=installJRMC_{FILE_ACTIVE_NAME_BASE} -v={FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}:z -w {FILE_ACTIVE_PATH} fedora:latest {FILE_ACTIVE} --debug'
   # Ubuntu
-  Run build silently in Ubuntu:
-    cmd: 'buildWrapper podmanRunEasy -m ephemeral -i ubuntu:latest -n installJRMC -w {FILE_ACTIVE_PATH} -d {FILE_ACTIVE_PATH}/RPMS --silent --mkexec {FILE_ACTIVE} --debug --build --container'
-  Run createrepo silently in Ubuntu:
-    cmd: 'buildWrapper podmanRunEasy -m ephemeral -i ubuntu:latest -n installJRMC -w {FILE_ACTIVE_PATH} -d {FILE_ACTIVE_PATH}/output/RPMS --silent --mkexec {FILE_ACTIVE} --debug --createrepo'
-  Run debug in Ubuntu:
-    cmd: 'buildWrapper podmanRunEasy -m ephemeral -i ubuntu:latest -n installJRMC -w {FILE_ACTIVE_PATH} --debug --mkexec {FILE_ACTIVE} --debug --container'
+  Run rpmbuild in Ubuntu:
+    cmd: 'podmanRun -o "--rm --name=installJRMC_{FILE_ACTIVE_NAME_BASE} -v={FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}:z -w {FILE_ACTIVE_PATH} ubuntu:latest {FILE_ACTIVE} --rpmbuild'
+  Run createrepo in Ubuntu:
+    cmd: 'podmanRun -o "--rm --name=installJRMC_{FILE_ACTIVE_NAME_BASE} -v={FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}:z -w {FILE_ACTIVE_PATH} ubuntu:latest {FILE_ACTIVE} --createrepo'

.gitignore

@@ -1,3 +1,5 @@
 **/
 *.zip
 testing.sh
+.lock
+tests

installJRMC

@@ -7,7 +7,7 @@ shopt -s extglob
 # Run installJRMC --help to see available options
 #
 # To-dos:
-#   1. Raspberry Pi support -- do not own one so difficult to test
+#   1. Raspberry Pi OS support
 #   2. Interactive installation (ncurses?)
 #
 # installJRMC can be run directly or sourced as a function (by sourcing this file)
@@ -18,7 +18,7 @@ shopt -s extglob
 #######################################
 installJRMC() {
 
-    _scriptversion="0.6"
+    _scriptversion="0.7"
     _boardurl="https://yabb.jriver.com/interact/index.php/board,64.0.html"
     _outputdir="$_basedir/output"
     _createrepo_webroot="/srv/jriver"
@@ -191,20 +191,9 @@ EOF
     }
 
 
-    err() {
-
-      echo "Error: $*" >&2
-    }
-
-
-    #######################################
-    # Call this at the beginning of every function in order to track
-    #######################################
-    debug() {
-
-        [[ -n $_debug ]] && echo "Debug: $*"
-    }
+    err() { echo "Error: $*" >&2; }
 
+    debug() { [[ -n $_debug ]] && echo "Debug: $*"; }
 
     #######################################
     # Prepend this to any command that you wish to execute with sudo
@@ -403,12 +392,12 @@ EOF
             echo "Installing:" "${_pkg_array[@]}"
             if [[ -n $_debug ]]; then
                 if ! _pkg_install "${_pkg_array[@]}"; then
-                    err "Failed to install package"
-                    exit 1
+                    err "Failed to install package. Attempting to continue..."
+                    return 1
                 fi
             elif ! _pkg_install "${_pkg_array[@]}" > /dev/null 2>&1; then
-                err "Failed to install package."
-                _printHelpAndExit 1
+                err "Failed to install package. Attempting to continue..."
+                return 1
             fi
         fi
 
@@ -417,12 +406,12 @@ EOF
             echo "Installing:" "${_url_pkg_array[@]}"
             if [[ -n $_debug ]]; then
                 if ! _pkg_install_nogpg "${_url_pkg_array[@]}"; then
-                    err "Failed to install required package from url"
-                    exit 1
+                    err "Failed to install package. Attempting to continue..."
+                    return 1
                 fi
             elif ! _pkg_install_nogpg "${_url_pkg_array[@]}" > /dev/null 2>&1; then
-                err "Failed to install required package from url"
-                _printHelpAndExit 1
+                err "Failed to install package. Attempting to continue..."
+                return 1
             fi
         fi
     }