🗃️ Committing everything that changed 🗃️

Dockerfile Dockerfile.19.04 Dockerfile.20.04 Dockerfile.21.04 Dockerfile.22.04 Dockerfile.23.04 Dockerfile.23.10 Dockerfile.24.04 Dockerfile.24.10 rootfs/usr/local/bin/pkmgr
2025-11-04 01:02:41 -05:00 · 2024-08-25 12:36:32 -04:00
parent 93cb97d366
commit dd38a2bd69
10 changed files with 21 additions and 21 deletions
--- a/2
+++ b/2
@@ -77,7 +77,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.19.04
+++ b/Dockerfile.19.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.20.04
+++ b/Dockerfile.20.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.21.04
+++ b/Dockerfile.21.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.22.04
+++ b/Dockerfile.22.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.23.04
+++ b/Dockerfile.23.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.23.10
+++ b/Dockerfile.23.10
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.24.04
+++ b/Dockerfile.24.04
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/Dockerfile.24.10
+++ b/Dockerfile.24.10
@@ -78,7 +78,7 @@ RUN set -e; \
  echo "Setting up prerequisites"; \
  echo "$LANG UTF-8" >"/etc/locale.gen"; \
  echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
-  apt update && apt upgrade -yy && apt install -yy bash locales; \
+  apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \
  dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \
  update-alternatives --install /bin/sh sh /bin/bash 1 

--- a/rootfs/usr/local/bin/pkmgr
+++ b/rootfs/usr/local/bin/pkmgr
@@ -12,28 +12,28 @@ USER_GID="$(id -g)"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ -f "/etc/pkmgr/options.conf" ] && . "/etc/pkmgr/options.conf"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -x "$(command -v apt 2>/dev/null)" ]; then
-  export DEBIAN_FRONTEND=noninteractive
-  pkmgr_cmd="apt"
-  pkmgr_clean_cmd="$pkmgr_cmd clean"
-  pkmgr_mkcache_cmd="$pkmgr_cmd update"
-  pkmgr_update_cmd="$pkmgr_cmd upgrade -yy"
-  pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS"
-elif [ -x "$(command -v apt-get 2>/dev/null)" ]; then
+if [ -x "$(command -v apt-get 2>/dev/null)" ]; then
  export DEBIAN_FRONTEND=noninteractive
  pkmgr_cmd="apt-get"
  pkmgr_clean_cmd="$pkmgr_cmd clean"
  pkmgr_mkcache_cmd="$pkmgr_cmd update"
  pkmgr_update_cmd="$pkmgr_cmd upgrade -yy"
  pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS"
-elif [ -x "$(command -v dnf 2>/dev/null)" ]; then
-  pkmgr_cmd="dnf"
+elif [ -x "$(command -v apt 2>/dev/null)" ]; then
+  export DEBIAN_FRONTEND=noninteractive
+  pkmgr_cmd="apt"
+  pkmgr_clean_cmd="$pkmgr_cmd clean"
+  pkmgr_mkcache_cmd="$pkmgr_cmd update"
+  pkmgr_update_cmd="$pkmgr_cmd upgrade -yy"
+  pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS"
+elif [ -x "$(command -v yum 2>/dev/null)" ]; then
+  pkmgr_cmd="yum"
  pkmgr_clean_cmd="$pkmgr_cmd clean all"
  pkmgr_mkcache_cmd="$pkmgr_cmd makecache"
  pkmgr_update_cmd="$pkmgr_cmd update -y --skip-broken $PKMGR_OPTS"
  pkmgr_install_cmd="$pkmgr_cmd install -y --skip-broken $PKMGR_OPTS"
-elif [ -x "$(command -v yum 2>/dev/null)" ]; then
-  pkmgr_cmd="yum"
+elif [ -x "$(command -v dnf 2>/dev/null)" ]; then
+  pkmgr_cmd="dnf"
  pkmgr_clean_cmd="$pkmgr_cmd clean all"
  pkmgr_mkcache_cmd="$pkmgr_cmd makecache"
  pkmgr_update_cmd="$pkmgr_cmd update -y --skip-broken $PKMGR_OPTS"