From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Nov 2013 17:06:24 +0000 (-0200)
Subject: ChangeLog update and minor keyringer_shred improvement
X-Git-Tag: 0.2.7~3
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d892fb9997a98d12d9a09b12d3179242c48a07c9;p=keyringer.git

ChangeLog update and minor keyringer_shred improvement
---

diff --git a/ChangeLog b/ChangeLog
index 629d2b5..b14e95a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-11-14 -       Silvio Rhatto  <rhatto@riseup.net>
 
+	Shred of temporary files (closes #27)
+
 	Encrypt/open improvements (closes #9)
 
 	Initialization now asks user to edit the default preferences file
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 4d97f34..d02b1d8 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -152,6 +152,8 @@ function keyringer_shred {
 
   if [ -z "$path" ]; then
     return
+  elif [ ! -e "$path" ]; then
+    return
   fi
 
   # Get shred implementation
@@ -170,7 +172,7 @@ function keyringer_shred {
   if [ -d "$path" ]; then
     find $path -exec $tool -f {} \;
     rmdir $path
-  elif [ -e "$path" ]; then
+  else
     $tool -f "$path"
   fi
 }