Browse Source

New generic install method

bryan 2 years ago
parent
commit
d0f43b6b30
1 changed files with 4 additions and 3 deletions
  1. 4 3
      installJRMC

+ 4 - 3
installJRMC

@@ -373,9 +373,9 @@ init() {
             PKG_INSTALL_LOCAL(){ installMCARCH; }
             PKG_INSTALL_LOCAL(){ installMCARCH; }
             ;;
             ;;
         unknown)
         unknown)
-            PKG_INSTALL=(":")
-            PKG_REMOVE=(":")
-            PKG_UPDATE=(":")
+            PKG_INSTALL=(:)
+            PKG_REMOVE=(:)
+            PKG_UPDATE=(:)
             PKG_INSTALL_LOCAL(){ installMCGENERIC; }
             PKG_INSTALL_LOCAL(){ installMCGENERIC; }
     esac
     esac
 }
 }
@@ -397,6 +397,7 @@ setMCVersion() {
         MCVERSION_SOURCE="user input"
         MCVERSION_SOURCE="user input"
     # Containerized package manager
     # Containerized package manager
     elif installPackage --silent buildah &&
     elif installPackage --silent buildah &&
+    hash buildah &>/dev/null &&
     cnt=$(buildah from --quiet debian:$DEBIANBASE-slim) &>/dev/null &&
     cnt=$(buildah from --quiet debian:$DEBIANBASE-slim) &>/dev/null &&
     buildah run "$cnt" -- bash -c \
     buildah run "$cnt" -- bash -c \
         "echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main' > /etc/apt/sources.list 2>&1" &>/dev/null &&
         "echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main' > /etc/apt/sources.list 2>&1" &>/dev/null &&