Added shred command. closes #26 #22

Author: iandstanley

docs/notebook.1

@@ -85,7 +85,7 @@ be entered before copying the note to a new note title. The new notebook will be
 .SY "delete|rm  notebook"
 .YS
 .OP notebook
-Delete a notebook with the included notes inside.
+Delete a notebook with the included notes inside. If GNU shred(1) is available notebook will use it to shred the files during deletion.
 
 .SH NOTES
 

docs/notes.1

@@ -192,6 +192,10 @@ will default to \fBnano\fP.
 By default notes creates it's notes directory in ~/.notes for the user. This can be 
 changed by modifying the shell script.
 
+Notes will find the GNU shred command if available using the options 
+--remove=wipe. If shred is not installed then it will default to using 
+the rm command.
+
 .SH FILES
 
 The following files are found in the notes directory (~/.notes by default):

notes

@@ -26,10 +26,16 @@ JOURNALDIR="${JOURNALDIR:-$DIRFORDIARY}"
 GPGKEY=''
 GPG_OPTS=" --quiet --yes --compress-algo=none --no-encrypt-to" 
 GPG="gpg"
-SHREDCMD="rm"
 EDITOR="${EDITOR:-nano}"
 PAGER="${PAGER:-more}"
-#SHREDCMD="shred"
+
+# Use shred if available
+SHRED="`which shred`"
+if [ $? = 0 ]; then 
+    SHREDCMD="${SHRED} --remove=wipe"
+else
+    SHREDCMD="rm"
+fi
 
 #
 # initialise notes system
@@ -122,7 +128,7 @@ validate_gpg_keyid () {
                 echo Invalid GPG keyid
                 cat $keyids
                 echo \n\n Type 'gpg -k <keyid> to find out more about key'
-                rm $keyids
+                ${SHREDCMD} $keyids
                 exit 1
             else 
                 echo Valid key $testkey
@@ -133,7 +139,7 @@ validate_gpg_keyid () {
             echo Valid keys are ...
             cat $keyids
             echo \n\n Type 'gpg -k <keyid> to find out more about key'
-            rm $keyids
+            ${SHREDCMD} $keyids
             exit 1;;
     esac
 }
@@ -147,7 +153,7 @@ note_add () {
     filen="$@"
     notefile="${USE_POINTER}/`echo ${filen} | tr ' ' '_'`"
 
-	if [ -f "$notefile.gpg" ] ; then
+	if [ -f "$notefile.asc" ] ; then
 		echo File exists ... cannot create. Try 'notes edit' instead.
         exit 1
 	else
@@ -163,7 +169,7 @@ note_add () {
 		# encrypt note file
 		$GPG -ear $KEY $GPG_OPTS  "$notefile"
 
-		rm "$notefile"
+		${SHREDCMD} "$notefile"
 	fi
 }
 
@@ -176,7 +182,7 @@ note_import () {
 	get_recipient
 
 	if [ -f "${toimport}" ] ; then 
-		$GPG -ear $KEY $GPG_OPTS -o  "${USE_POINTER}/${target}.gpg" "${toimport}" 
+		$GPG -ear $KEY $GPG_OPTS -o  "${USE_POINTER}/${target}.asc" "${toimport}" 
 	fi
 }
 
@@ -188,8 +194,8 @@ note_view () {
 
 	if [ -f "${notefile}" ]; then 
 		gpg -d "${notefile}" 
-	elif [ -f "${notefile}.gpg" ]; then 
-		gpg -d "${notefile}.gpg" 
+	elif [ -f "${notefile}.asc" ]; then 
+		gpg -d "${notefile}.asc" 
 	else 
 		echo Note file does not exist
         exit 1
@@ -199,20 +205,20 @@ note_view () {
 note_edit () {
 	notefile="`echo $@ | tr ' ' '_'`"
 	notefile="${USE_POINTER}/${notefile}"
-	decrypted="`echo ${notefile} | sed s/.gpg//`"
+	decrypted="`echo ${notefile} | sed s/.asc//`"
 
 	get_recipient 
 
 	if [ -f "$notefile" ]; then 
 		gpg -d -o "${decrypted}" "${notefile}" 
 		${EDITOR} "${decrypted}" 
 		$GPG -ear $KEY $GPG_OPTS  "${decrypted}"
-		rm ${decrypted}
-	elif [ -f "${notefile}.gpg" ]; then 
-		gpg -d -o "${decrypted}"  "${notefile}.gpg" 
+		${SHREDCMD} ${decrypted}
+	elif [ -f "${notefile}.asc" ]; then 
+		gpg -d -o "${decrypted}"  "${notefile}.asc" 
 		${EDITOR} "${decrypted}" 
 		$GPG -ear $KEY $GPG_OPTS  "${decrypted}"
-		rm ${decrypted}
+		${SHREDCMD} ${decrypted}
 	else 
 		echo Note file does not exist
         exit 1
@@ -228,9 +234,9 @@ note_delete () {
 	notefile="${USE_POINTER}/${notefile}"
 
 	if [ -f "$notefile" ]; then 
-		rm -i "$notefile" 
-	elif [ -f "${notefile}.gpg" ]; then 
-		rm -i "${notefile}.gpg" 
+		${SHREDCMD} "$notefile" 
+	elif [ -f "${notefile}.asc" ]; then 
+		${SHREDCMD} "${notefile}.asc" 
 	else 
 		echo Note file does not exist
 	fi
@@ -247,13 +253,13 @@ note_rename () {
 
 	case $notefile in
 		*gpg)   skip;;
-		*)      notefile="${notefile}.gpg"
+		*)      notefile="${notefile}.asc"
 	esac 
 
 	newnotefile="${USE_POINTER}/${newname}"
 	case $newnotefile in
 		*gpg)   skip;;
-		*)      newnotefile="${newnotefile}.gpg"
+		*)      newnotefile="${newnotefile}.asc"
 	esac 
 
 	case $MVCP in 
@@ -264,7 +270,7 @@ note_rename () {
 	if [ -f "$notefile" ] ; then
 		echo $notefile exists .... $processing
 		$MVCP  "$notefile" "$newnotefile"
-	elif [ -f "${notefile}.gpg" ] ; then 
+	elif [ -f "${notefile}.asc" ] ; then 
 		echo $notefile exists .... $processing
 		$MVCP   "$notefile" "$newnotefile"
 	else
@@ -297,7 +303,7 @@ notebook_delete () {
 		exit 1
 	else
 		echo Deleting files from $notebook
-		rm -if ${notebook}/*.gpg
+		${SHREDCMD} ${notebook}/*.asc
 
 		if [ $? = 0 ] ; then 
 			rmdir "$notebook"
@@ -456,7 +462,7 @@ cmd_show () {
 cmd_find () {
 	searchterm="$@"
 
-	for file in ${USE_POINTER}/*.gpg
+	for file in ${USE_POINTER}/*.asc
 	do
 		gpg -d $file  2>/dev/null | grep -H --label ${file}   "$searchterm" 
 	done
@@ -562,12 +568,12 @@ cmd_newkey () {
     get_gpg_keyid   $mynewkey
 
     # now recrypt files 
-    find ~/.notes -name \*.gpg | sed s/.gpg// | \
+    find ~/.notes -name \*.asc | sed s/.asc// | \
 
         while read filen ; 
         do 
             echo $filen; 
-            gpg -o "${filen}" --yes -d "${filen}.gpg" 
+            gpg -o "${filen}" --yes -d "${filen}.asc" 
             gpg -r ${mynewkey} --yes -ea "${filen}"  && ${SHREDCMD} "${filen}"
 
         done