From cc5b1435960222049ada99d01b6a5c17b97018ec Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 17 May 2023 15:32:05 -0300 Subject: Feat: trashman_apt_install(): support for arbitrary keyring folders --- share/trashman/trashman/debian | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/share/trashman/trashman/debian b/share/trashman/trashman/debian index db737ff..78514ae 100644 --- a/share/trashman/trashman/debian +++ b/share/trashman/trashman/debian @@ -53,13 +53,18 @@ trashman_apt_install() { trashman_install_apt_key() { local orig="$1" local dest="$2" + local base_dest="$3" if [ ! -e "$orig" ]; then exit 1 fi - $SUDO cp $orig /etc/apt/trusted.gpg.d/$dest || exit 1 - $SUDO chown root.root /etc/apt/trusted.gpg.d/$dest && $SUDO chmod 644 /etc/apt/trusted.gpg.d/$dest || exit 1 + if [ -z "$base_dest" ]; then + base_dest="/etc/apt/trusted.gpg.d" + fi + + $SUDO cp $orig $base_dest/$dest || exit 1 + $SUDO chown root.root $base_dest/$dest && $SUDO chmod 644 $base_dest/$dest || exit 1 } # Determine Debian major version name -- cgit v1.2.3