]> gitweb.fluxo.info Git - trashman.git/commitdiff
Feat: trashman_apt_install(): support for arbitrary keyring folders
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 17 May 2023 18:32:05 +0000 (15:32 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 17 May 2023 18:32:05 +0000 (15:32 -0300)
share/trashman/trashman/debian

index db737ff49eb0866bdb410b9293d38cdd2cab0348..78514ae04a1cea9a1f3cfa7fb177acb06a7b7a54 100644 (file)
@@ -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