From dd38a2bd699a1be5942ab12db593c25d8a408e21 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 25 Aug 2024 12:36:32 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Dockerfile | 2 +- Dockerfile.19.04 | 2 +- Dockerfile.20.04 | 2 +- Dockerfile.21.04 | 2 +- Dockerfile.22.04 | 2 +- Dockerfile.23.04 | 2 +- Dockerfile.23.10 | 2 +- Dockerfile.24.04 | 2 +- Dockerfile.24.10 | 2 +- rootfs/usr/local/bin/pkmgr | 24 ++++++++++++------------ 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbdad98..605d180 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Dockerfile.19.04 b/Dockerfile.19.04 index 162d8dc..9db03e9 100644 --- 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 diff --git a/Dockerfile.20.04 b/Dockerfile.20.04 index 89985ca..5b95ed9 100644 --- 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 diff --git a/Dockerfile.21.04 b/Dockerfile.21.04 index 45a2197..84e1ac7 100644 --- 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 diff --git a/Dockerfile.22.04 b/Dockerfile.22.04 index c591a17..3919975 100644 --- 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 diff --git a/Dockerfile.23.04 b/Dockerfile.23.04 index efa2d66..1db33d6 100644 --- 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 diff --git a/Dockerfile.23.10 b/Dockerfile.23.10 index 0233b47..2a34604 100644 --- 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 diff --git a/Dockerfile.24.04 b/Dockerfile.24.04 index b807582..fe3c880 100644 --- 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 diff --git a/Dockerfile.24.10 b/Dockerfile.24.10 index 9121377..305e73f 100644 --- 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 diff --git a/rootfs/usr/local/bin/pkmgr b/rootfs/usr/local/bin/pkmgr index 137af81..69475c9 100755 --- 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"