From 25e5d399d1e9c096deabca98d0c21cda5fd69ce4 Mon Sep 17 00:00:00 2001
From: Jon-William Lewis <xilmwa@xenami.net>
Date: Mon, 25 Jan 2016 21:20:20 -0600
Subject: [PATCH] fixed print function and made appropriate changes to other
 parts of the program; changed version to alpha 8

---
 header.sh                     |  2 +-
 sns.sh                        | 20 ++++++++++++--------
 src/includes/edit.sns.sh      |  3 ++-
 src/includes/libencryption.sh |  2 +-
 src/includes/list.sns.sh      |  4 ++--
 src/main/stage3.sns.sh        |  7 +++++--
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/header.sh b/header.sh
index 7f582a6..7a591c0 100644
--- a/header.sh
+++ b/header.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PROD_STR="Simple Note System"
-VER_STR="v2.0a7"
+VER_STR="v2.0a8"
 
 cat << EOF
 #!/bin/bash
diff --git a/sns.sh b/sns.sh
index 7f07f64..33cf6b0 100755
--- a/sns.sh
+++ b/sns.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #==========================================================
-# Simple Note System, v2.0a6
+# Simple Note System, v2.0a7
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
 #==========================================================
 
 if [ -z "$HOME" ]; then HOME=/home/"$(whoami)"; fi
 
 PROD_STR="Simple Note System"
-readonly VER_STR="v2.0a6"
+readonly VER_STR="v2.0a7"
 readonly ROOT_DIR="$HOME"/.config/xenlabs/sns
 readonly BASE_DIR="$ROOT_DIR"/notes
 readonly TMP_DIR="$ROOT_DIR"/tmp
@@ -84,7 +84,7 @@ function decrypt(){
 # This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an
 # output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
-
+    echo "$NOTE"; pause
     gpg -d "$NOTE"
 }
 function create(){
@@ -132,7 +132,8 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
     if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    decrypt > "$TMP_DIR/$RANDOM"
+    TARGET="$TMP_DIR/$SESSION_ID"
+    decrypt > "$TARGET"
 else TARGET="$NOTE"; fi
 
 
@@ -162,8 +163,8 @@ function print(){
 function list(){
     if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
         printf "+%s\n" "$NOTEBOOK"
-        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read NOTE; do
-            printf " -%s\n" "$(basename $NOTE | cut -d . -f 1)"
+        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
+            printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
         done
     fi
 }
@@ -288,9 +289,12 @@ fi
 
 SESSION_ID="$RANDOM"
 NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/
-NOTE="$NOTE_DIR""$NAME"."$EXT"
 
-if [ "$ENCRYPTION" == "TRUE" ]; then NOTE="$NOTE".gpg; fi
+
+if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg
+else readonly NOTE="$NOTE_DIR""$NAME"."$EXT"
+fi
+
 if [ "$PRINT"      == "TRUE" ]; then print; exit 0; fi
 if [ "$DELETE"     == "TRUE" ]; then delete; exit 0; fi
 if [ "$CREATE"     == "TRUE" ]; then create; fi
diff --git a/src/includes/edit.sns.sh b/src/includes/edit.sns.sh
index c260f8d..cc5e15f 100644
--- a/src/includes/edit.sns.sh
+++ b/src/includes/edit.sns.sh
@@ -7,7 +7,8 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
     cp "$NOTE" "$NOTE".bk
     if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
-    decrypt > "$TMP_DIR/$RANDOM"
+    TARGET="$TMP_DIR/$SESSION_ID"
+    decrypt > "$TARGET"
 else TARGET="$NOTE"; fi
 
 
diff --git a/src/includes/libencryption.sh b/src/includes/libencryption.sh
index 265c331..d87fb52 100644
--- a/src/includes/libencryption.sh
+++ b/src/includes/libencryption.sh
@@ -11,6 +11,6 @@ function decrypt(){
 # This function, given a recipient, $PUBKEY; a file to decrypt, $TARGET; and an
 # output file, "$NOTE", will decrpyt $TARGET to $NOTE against $PUBKEY's private
 # GPG key.
-
+    echo "$NOTE"; pause
     gpg -d "$NOTE"
 }
diff --git a/src/includes/list.sns.sh b/src/includes/list.sns.sh
index 429203c..e4c75da 100644
--- a/src/includes/list.sns.sh
+++ b/src/includes/list.sns.sh
@@ -1,8 +1,8 @@
 function list(){
     if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
         printf "+%s\n" "$NOTEBOOK"
-        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read NOTE; do
-            printf " -%s\n" "$(basename $NOTE | cut -d . -f 1)"
+        find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
+            printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
         done
     fi
 }
diff --git a/src/main/stage3.sns.sh b/src/main/stage3.sns.sh
index 1686c7b..d9a046b 100644
--- a/src/main/stage3.sns.sh
+++ b/src/main/stage3.sns.sh
@@ -23,9 +23,12 @@ fi
 
 SESSION_ID="$RANDOM"
 NOTE_DIR="$BASE_DIR"/"$NOTEBOOK"/"$SECTION"/
-NOTE="$NOTE_DIR""$NAME"."$EXT"
 
-if [ "$ENCRYPTION" == "TRUE" ]; then NOTE="$NOTE".gpg; fi
+
+if [ "$ENCRYPTION" == "TRUE" ]; then readonly NOTE="$NOTE_DIR""$NAME"."$EXT".gpg
+else readonly NOTE="$NOTE_DIR""$NAME"."$EXT"
+fi
+
 if [ "$PRINT"      == "TRUE" ]; then print; exit 0; fi
 if [ "$DELETE"     == "TRUE" ]; then delete; exit 0; fi
 if [ "$CREATE"     == "TRUE" ]; then create; fi