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.
This commit is contained in:
Jon-William Lewis
2015-05-07 21:23:12 -05:00
parent a0ad2e7d48
commit 64e504ebcb
11 changed files with 170 additions and 109 deletions

View File

@@ -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
}