ChangeLog update and minor keyringer_shred improvement

diff --git a/ChangeLog b/ChangeLog
index 629d2b5b961f8b785f7f20399445767b5aba250a..b14e95af8b3139cdbbdf949dd2fffd64cdfdde6a 100644 (file)
--- 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 4d97f34cb4ca7ef4cf1934f28213ac2f0cab284f..d02b1d846f2fd59d7f3a8f8170b2748fc6a094b4 100755 (executable)
--- 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
 }