Fixed erroneous reference to former static ~/.sns BASEDIR

Added hook to actually delete a note if requested
Removed old, commented code
Simplified create and delete logic by removing unnecessary checks that make no sense to me now
Cleaned up output from create event

sns.sh

@@ -71,34 +71,8 @@ function decrypt(){
     TARGET="$ROOTDIR"/tmp/"$RANDOM"
     openssl enc -d -aes-256-cbc -in "$NOTE" -pass pass:"$ENC_KEY" > "$TARGET"
 }
-#function create(){
-#
-#   #Check if note exists
-#   if [ -e "$NOTE" -o -e ${NOTE%.*} ]; then
-#       echo ""
-#       echo "ERROR: Note already exists"
-#       echo "Hint: use -e to edit the note."
-#       echo ""
-#       exit
-#   else
-#       #Create any necessary folders
-#       mkdir -p $NOTEDIR
-#
-#       #Fill in title
-#       echo "TITLE: $NAME" > $NOTE
-#       #Fill the second line with the date
-#        echo "DATE: $(date)" >> $NOTE
-#
-#       if [ "$ENCRYPTION" == "TRUE" ]; then
-#           if [ "$EDIT" == "FALSE" ]; then
-#              echo " openssl enc -aes-256-cbc -salt -in $NOTE -out $NOTE.enc -pass pass:$ENC_KEY"
-#           fi
-#       fi
-#   fi
-#}
-
 function create(){
-    if [ -e "$NOTE" ] || [ -e "${NOTE%.*}" ]; then
+    if [ -e "$NOTE" ]; then
        printf "\nERROR: Note already exists\nHint: use -e to edit the note.\n"
        exit
     else
@@ -113,22 +87,22 @@ function create(){
         p_header | openssl enc -aes-256-cbc -salt -out "$NOTE"\
         -pass pass:"$ENC_KEY"
     fi
-    echo "$NOTE"
+
+    if [ -e "$NOTE" ]; then
+        echo "Created note: $NOTEBOOK/$SECTION/$NAME."
+    fi
+
 }
 function delete(){
     if [ "$DELETE" == "TRUE" ]; then
-        if [ -e "$NOTE" ] || [ -e "${NOTE%.*}" ]; then
+        if [ -e "$NOTE" ]; then
-            if [ "$ENCRYPTION" == "TRUE" ]; then
-                rm "${NOTE%.*}"
-            else
             rm "$NOTE"
-            fi
             echo ""
-            echo "Deleted note: $NOTEBOOK/$SECTION$NAME."
+            echo "Deleted note: $NOTEBOOK/$SECTION/$NAME."
             exit
         else
             echo ""
-            echo "ERROR: Note $NOTEBOOK/$SECTION$NAME does not exist."
+            echo "ERROR: Note $NOTEBOOK/$SECTION/$NAME does not exist."
             exit
         fi
     fi
@@ -221,8 +195,8 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
 PROD_STR="Simple Note System (Encryption Enabled)"
 EXT="$EXT"
-if [ ! -d ~/.sns/tmp ]; then
+if [ ! -d "$BASEDIR"/tmp ]; then
-mkdir -p ~/.sns/tmp
+mkdir -p "$BASEDIR"/tmp
 fi
 fi
 
@@ -308,7 +282,8 @@ fi
 NOTEDIR="$BASEDIR"/"$NOTEBOOK"/"$SECTION"/
 NOTE="$NOTEDIR""$NAME"."$EXT"
 
-if [ "$ENCRYPTION" == "TRUE" ]; then NOTE=$NOTE.enc; fi
+if [ "$ENCRYPTION" == "TRUE" ]; then NOTE="$NOTE".enc; fi
 if [ "$PRINT"      == "TRUE" ]; then print; exit 0; fi
+if [ "$DELETE"     == "TRUE" ]; then delete; exit 0; fi
 if [ "$CREATE"     == "TRUE" ]; then create; fi
 if [ "$EDIT"       == "TRUE" ]; then edit; fi

src/includes/create.sns.sh

@@ -1,31 +1,5 @@
-#function create(){
-#
-#   #Check if note exists
-#   if [ -e "$NOTE" -o -e ${NOTE%.*} ]; then
-#       echo ""
-#       echo "ERROR: Note already exists"
-#       echo "Hint: use -e to edit the note."
-#       echo ""
-#       exit
-#   else
-#       #Create any necessary folders
-#       mkdir -p $NOTEDIR
-#
-#       #Fill in title
-#       echo "TITLE: $NAME" > $NOTE
-#       #Fill the second line with the date
-#        echo "DATE: $(date)" >> $NOTE
-#
-#       if [ "$ENCRYPTION" == "TRUE" ]; then
-#           if [ "$EDIT" == "FALSE" ]; then
-#              echo " openssl enc -aes-256-cbc -salt -in $NOTE -out $NOTE.enc -pass pass:$ENC_KEY"
-#           fi
-#       fi
-#   fi
-#}
-
 function create(){
-    if [ -e "$NOTE" ] || [ -e "${NOTE%.*}" ]; then
+    if [ -e "$NOTE" ]; then
        printf "\nERROR: Note already exists\nHint: use -e to edit the note.\n"
        exit
     else
@@ -40,5 +14,9 @@ function create(){
         p_header | openssl enc -aes-256-cbc -salt -out "$NOTE"\
         -pass pass:"$ENC_KEY"
     fi
-    echo "$NOTE"
+
+    if [ -e "$NOTE" ]; then
+        echo "Created note: $NOTEBOOK/$SECTION/$NAME."
+    fi
+
 }

src/includes/delete.sns.sh

@@ -1,17 +1,13 @@
 function delete(){
     if [ "$DELETE" == "TRUE" ]; then
-        if [ -e "$NOTE" ] || [ -e "${NOTE%.*}" ]; then
+        if [ -e "$NOTE" ]; then
-            if [ "$ENCRYPTION" == "TRUE" ]; then
-                rm "${NOTE%.*}"
-            else
             rm "$NOTE"
-            fi
             echo ""
-            echo "Deleted note: $NOTEBOOK/$SECTION$NAME."
+            echo "Deleted note: $NOTEBOOK/$SECTION/$NAME."
             exit
         else
             echo ""
-            echo "ERROR: Note $NOTEBOOK/$SECTION$NAME does not exist."
+            echo "ERROR: Note $NOTEBOOK/$SECTION/$NAME does not exist."
             exit
         fi
     fi

src/main/stage1.sns.sh

@@ -19,8 +19,8 @@ fi
 if [ "$ENCRYPTION" == "TRUE" ]; then
 PROD_STR="Simple Note System (Encryption Enabled)"
 EXT="$EXT"
-if [ ! -d ~/.sns/tmp ]; then
+if [ ! -d "$BASEDIR"/tmp ]; then
-mkdir -p ~/.sns/tmp
+mkdir -p "$BASEDIR"/tmp
 fi
 fi
 

src/main/stage3.sns.sh

@@ -24,7 +24,8 @@ fi
 NOTEDIR="$BASEDIR"/"$NOTEBOOK"/"$SECTION"/
 NOTE="$NOTEDIR""$NAME"."$EXT"
 
-if [ "$ENCRYPTION" == "TRUE" ]; then NOTE=$NOTE.enc; fi
+if [ "$ENCRYPTION" == "TRUE" ]; then NOTE="$NOTE".enc; fi
 if [ "$PRINT"      == "TRUE" ]; then print; exit 0; fi
+if [ "$DELETE"     == "TRUE" ]; then delete; exit 0; fi
 if [ "$CREATE"     == "TRUE" ]; then create; fi
 if [ "$EDIT"       == "TRUE" ]; then edit; fi