v2.0a3 -> v2.0a4

Rearranged tree to be more sane.
Made formatting changes to stage 2.
Fixed a bug where edit would be bypassed if the note was just created.

functions/create.sns.sh

@@ -1,28 +1,42 @@
+#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 [ -z "$CREATE" -a -z "$EDIT" -a -z "$PRINT" ]; then #If no action specified, print help and exit
-        help
-        exit
-    elif [ "$CREATE" == "TRUE" ]; then
-        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
+    if [ -e "$NOTE" -o -e ${NOTE%.*} ]; then
+       printf "\nERROR: Note already exists\nHint: use -e to edit the note.\n"
+       exit
+    elif [ -z "$ENCRYPTION" ]; then
+        echo "TITLE: $NAME" > $NOTE
+        echo "DATE: $(date)" >> $NOTE
+    elif [ "$ENCRYPTION" == "TRUE" ]; then
+        mkdir -p "$NOTEDIR"
+        touch "$NOTE"
+    echo "$(p_header)" | openssl enc -aes-256-cbc -salt -out "$NOTE"\
+    -pass pass:$ENC_KEY
 
-            #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
-                    openssl enc -aes-256-cbc -salt -in $NOTE -out ${NOTE%.*} -pass pass:$ENC_KEY
-                fi
-            fi
-        fi
     fi
+    echo "$NOTE"
 }

functions/edit.sns.sh

@@ -1,27 +1,26 @@
 function edit (){
-    if [ "$EDIT" == "TRUE" ]; then
-        if [ -r "$NOTE" -o -r ${NOTE%.*} ]; then
-            if [ -z "$CREATE" ]; then
-                if [ "$ENCRYPTION" == "TRUE" ]; then
-                    TMP_NAME=$ROOTDIR/tmp/$RANDOM
-                    openssl enc -d -aes-256-cbc -in ${NOTE%.*} -pass pass:$ENC_KEY > $TMP_NAME
-                    echo "" >> $TMP_NAME
-                    echo "EDIT $(date)" >> $TMP_NAME
-                else
-                    echo "" >> $NOTE
-                    echo "EDIT $(date)" >> $NOTE
-                fi
-            fi
-            $EDITOR $NOTE
+    if [ -r "$NOTE" -o -r ${NOTE%.*} ]; then
+        #Pre-Processing (Encryption)
+        if [ -z "$CREATE" ]; then
             if [ "$ENCRYPTION" == "TRUE" ]; then
-                openssl enc -aes-256-cbc -salt -in $NOTE -out ${NOTE%.*} -pass pass:$ENC_KEY
-                rm $NOTE
+                TMP_NAME="$ROOTDIR"/tmp/"$RANDOM"
+                openssl enc -d -aes-256-cbc -in $NOTE -pass pass:$ENC_KEY > $TMP_NAME
+                echo "" >> $TMP_NAME
+                echo "EDIT $(date)" >> $TMP_NAME
+                $EDITOR $TMP_NAME
+            else
+                echo "" >> $NOTE
+                echo "EDIT $(date)" >> $NOTE
+                $EDITOR $NOTE
             fi
-
-        else
-            echo ""
-            echo "ERROR: Note cannot be opened for editting."
-            echo ""
         fi
+        #Post-Processing (Encryption)
+        if [ "$ENCRYPTION" == "TRUE" ]; then
+            openssl enc -aes-256-cbc -salt -in $TMP_NAME -out $NOTE -pass pass:$ENC_KEY
+            rm "$TMP_NAME"
+        fi
+
+    else
+        printf "\nERROR: Note cannot be opened for editting.\n"
     fi
 }

functions/init_default_config.sns.sh

@@ -1,7 +1,19 @@
 function init_default_config() {
+if [ -z "$ROOTDIR" ]; then
     ROOTDIR=$HOME/.sns
+fi
+if [ -z "$BASEDIR" ]; then
     BASEDIR=$ROOTDIR/notes
+fi
+if [ -z "$EXT" ]; then
     EXT=note
+fi
+if [ -z "$EDITOR" ]; then
     EDITOR=vim
+fi
+if [ -z "$ENC_KEY" ]; then
     ENCRYPTION="FALSE"
+else
+    ENCRYPTION="TRUE"
+fi
 }

functions/p_header.sh

@@ -0,0 +1,3 @@
+function p_header(){
+    printf "TITLE: $NAME\nDATE: $(date)\n"
+}

functions/w_conf.sns.sh

@@ -1,4 +1,4 @@
-function writeconf {
+function w_conf {
 cat > $HOME/.sns/sns.conf << EOF
 #==========================================================
 # Simple Note System Config, v2.0a1