Variable name reworking; laid foundation for GPG encryption (instead of OpenSSL)

src/includes/create.sns.sh

@@ -3,7 +3,7 @@ function create(){
        printf "\nERROR: Note already exists\nHint: use -e to edit the note.\n"
        exit
     else
-        mkdir -p "$NOTEDIR"
+        mkdir -p "$NOTE_DIR"
     fi
 
     if [ -z "$ENCRYPTION" ]; then

src/includes/create_sns_root.sns.sh

@@ -1,6 +1,10 @@
 function w_conf {
-if [ ! -r "$ROOTDIR" ]; then mkdir -p "$ROOTDIR"; fi
-cat > "$CONFIGURATION" << EOF
+
+if [ ! -r "$ROOT_DIR" ]; then mkdir -p "$ROOT_DIR"; fi
+if [ ! -d "$TMP_DIR"  ]; then mkdir -p "$TMP_DIR" ; fi
+
+
+cat > "$CONFIG_FILE" << EOF
 #==========================================================
 # Simple Note System Config, v2.0a5
 # Copyright 2014, Xenese Labs/Sicron-Perion XNF
@@ -16,9 +20,12 @@ fi
 
 #Encryption
 #WARNING: ANY PREVIOUSLY UNENCRYPTED NOTES WILL BE LOST
+
+#ENCRYPTION="TRUE"
 ENCRYPTION="FALSE"
-ENC_KEY=""
+
+PUBKEY=""
 EOF
 
-chmod 600 "$CONFIGURATION"
+chmod 600 "$CONFIG_FILE"
 }

src/includes/libencryption.sh

@@ -1,8 +1,18 @@
 function encrypt(){
-    openssl enc -aes-256-cbc -salt -in "$TARGET" -out "$NOTE" -pass pass:"$ENC_KEY"
+# This function, given a recipient, $PUBKEY; a file to encrypt, $TARGET; and an
+# output file, "$NOTE", will encrypt $TARGET to $NOTE against $PUBKEY's private
+# GPG key.
+
+gpg -r "$PUBKEY" --encrypt-files "$TARGET" --output "$NOTE"
+
 }
 
 function decrypt(){
-    TARGET="$ROOTDIR"/tmp/"$RANDOM"
-    openssl enc -d -aes-256-cbc -in "$NOTE" -pass pass:"$ENC_KEY" > "$TARGET"
+# 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.
+
+    if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
+    TARGET="$TMP_DIR/$RANDOM"
+    gpg -d "$NOTE" > "$TARGET"
 }

src/includes/list.sns.sh

@@ -1,11 +1,15 @@
 function list(){
-    if [ -d "$BASEDIR"/"$NOTEBOOK" ]; then
+    if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
         printf "\nNotes in %s:\n" "$(basename "$NOTEBOOK")"
 
-        NOTES=( $(find "$BASEDIR"/"$NOTEBOOK" -name "*.$EXT" -print0 | sed s:"$BASEDIR"/"$NOTEBOOK"/: "    " :g | sed -e s:".$EXT"::g | tr "/" " ") )
+        NOTES=(
+            $(find "$BASE_DIR"/"$NOTEBOOK" -name "*.$EXT" -print0 |\
+                sed s:"$BASE_DIR"/"$NOTEBOOK"/: "    " :g |\
+                sed -e s:".$EXT"::g | tr "/" " ")
+        )
         let i=0
         for NOTE in "${NOTES[@]}"; do
-            if [ -d "$BASEDIR"/"$NOTEBOOK"/"$NOTE" ]; then
+            if [ -d "$BASE_DIR"/"$NOTEBOOK"/"$NOTE" ]; then
                 if [ "$LAST_SECTION" != "$NOTE" ]; then
                     printf "  Section: %s\n" "$NOTE"
                 fi

src/includes/pause.sns.sh

@@ -1,4 +1,4 @@
 function pause {
-    read -p "  Press [Enter] to continue."
+    read -rp "  Press [Enter] to continue."
     echo ""
 }