From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 May 2018 16:00:54 +0000 (-0300)
Subject: Cleanup mktemp target at keyringer_shred
X-Git-Tag: 0.5.3~10
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ae3c0b175a293a689d876ed0b5d6b29af4a4012c;p=keyringer.git

Cleanup mktemp target at keyringer_shred
---

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 6fc82e7..9f67fc9 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -192,14 +192,15 @@ function keyringer_shred {
     return
   fi
 
+  # Create our test target
+  _F="$(mktemp)"
+
   # Get shred implementation
   if which wipe &> /dev/null; then
     tool="wipe"
   elif which shred &> /dev/null; then
     tool="shred"
-  elif which gshred &> /dev/null; then
-    tool="gshred"
-  elif _F=$(mktemp); rm -P "${_F}" &> /dev/null; then
+  elif rm -P "${_F}" &> /dev/null; then
     tool="rm -P"
   else
     # Worst implementation
@@ -207,6 +208,9 @@ function keyringer_shred {
     tool="rm"
   fi
 
+  # Cleanup in case "rm -P" is never called or -P flag is unsupported
+  rm -f "${_F}"
+
   echo "$message $path using $tool..."
 
   if [ -d "$path" ]; then