From 6b7d40b037b981a6a5b5e6cfdc5dc6fddcd8c898 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 28 Dec 2024 13:25:28 -0500 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 rootfs/usr/local/bin/pkmgr --- rootfs/usr/local/bin/pkmgr | 54 ++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/rootfs/usr/local/bin/pkmgr b/rootfs/usr/local/bin/pkmgr index 137af81..4a3575e 100755 --- a/rootfs/usr/local/bin/pkmgr +++ b/rootfs/usr/local/bin/pkmgr @@ -1,17 +1,10 @@ -#!/usr/bin/env bash -# shellcheck shell=bash +#!/usr/bin/env sh +# shellcheck shell=sh # shellcheck disable=SC2016 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ -n "$_DEBUG" ] && _DEBUG_OPTIONS="-x" -[ "$1" = "--debug" ] && _DEBUG_OPTIONS="-x" && shift 1 -[ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -set -e $_DEBUG_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - USER_UID="$(id -u)" 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" @@ -19,6 +12,7 @@ if [ -x "$(command -v apt 2>/dev/null)" ]; then pkmgr_mkcache_cmd="$pkmgr_cmd update" pkmgr_update_cmd="$pkmgr_cmd upgrade -yy" pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS" + pkmgr_install_post="$pkmgr_cmd --fix-broken install" elif [ -x "$(command -v apt-get 2>/dev/null)" ]; then export DEBIAN_FRONTEND=noninteractive pkmgr_cmd="apt-get" @@ -26,6 +20,7 @@ elif [ -x "$(command -v apt-get 2>/dev/null)" ]; then pkmgr_mkcache_cmd="$pkmgr_cmd update" pkmgr_update_cmd="$pkmgr_cmd upgrade -yy" pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS" + pkmgr_install_post="$pkmgr_cmd --fix-broken install" elif [ -x "$(command -v dnf 2>/dev/null)" ]; then pkmgr_cmd="dnf" pkmgr_clean_cmd="$pkmgr_cmd clean all" @@ -90,13 +85,34 @@ pip) case "$1" in install) shift 1 - $pip_bin -m $pip_opts "$@" + pkg_list="$*" + for pkg in $pkg_list; do + $pip_bin -m pip $pip_opts "$pkg" + done ;; *) - $pip_bin "$@" + for pkg in "$@"; do + $pip_bin -m pip "$pkg" + done ;; esac - exit $? + exit + ;; +install) + shift 1 + [ -n "$1" ] || exit 0 + [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_install_cmd="sudo $pkmgr_install_cmd" + if [ -f "$1" ]; then + install_list="$(cat "$1")" + else + install_list="$*" + fi + for pkg in $install_list; do + echo "installing packages command: $pkmgr_install_cmd $pkg" + $pkmgr_install_cmd $pkg + [ -n "$pkmgr_install_post" ] && eval $pkmgr_install_post + done + exit ;; update | upgrade) shift $# @@ -114,20 +130,6 @@ clean) $pkmgr_clean_cmd exit $? ;; -install) - shift 1 - [ -n "$1" ] || exit 0 - [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_install_cmd="sudo $pkmgr_install_cmd" - if [ -f "$1" ]; then - install_list="$(cat "$1")" - echo 'installing packages from file with command: '$pkmgr_install_cmd' "$(<"$1")"' - else - install_list="$*" - echo "installing packages command: $pkmgr_install_cmd $install_list" - fi - $pkmgr_install_cmd $install_list - exit $? - ;; *) [ -n "$1" ] || exit 0 [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_cmd="sudo $pkmgr_cmd"