Corrected issues arising from "$BASE_DIR" vs "$ROOT_DIR"
This commit is contained in:
@@ -10,8 +10,8 @@ function create(){
|
||||
echo "TITLE: $NAME" > "$NOTE"
|
||||
echo "DATE: $(date)" >> "$NOTE"
|
||||
elif [ "$ENCRYPTION" == "TRUE" ]; then
|
||||
TARGET="$TMP_DIR"/"$SESSION_ID"
|
||||
p_header > "$TARGET"
|
||||
TMP_NOTE="$TMP_DIR"/"$SESSION_ID"
|
||||
p_header > "$TMP_NOTE"
|
||||
encrypt
|
||||
fi
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@ fi
|
||||
if [ "$ENCRYPTION" == "TRUE" ]; then
|
||||
cp "$NOTE" "$NOTE".bk
|
||||
if [ ! -d "$ROOT_DIR"/tmp ]; then mkdir "$ROOT_DIR"/tmp; fi
|
||||
TARGET="$TMP_DIR/$SESSION_ID"
|
||||
decrypt > "$TARGET"
|
||||
else TARGET="$NOTE"; fi
|
||||
TMP_NOTE="$TMP_DIR/$SESSION_ID"
|
||||
decrypt > "$TMP_NOTE"
|
||||
else TMP_NOTE="$NOTE"; fi
|
||||
|
||||
|
||||
if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TARGET"; fi
|
||||
if [ -z "$CREATE" ]; then printf "\nEDIT %s" "$(date)" >> "$TMP_NOTE"; fi
|
||||
|
||||
"$EDITOR" "$TARGET"
|
||||
"$EDITOR" "$TMP_NOTE"
|
||||
|
||||
if [ "$ENCRYPTION" == "TRUE" ]; then
|
||||
rm "$NOTE"
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
function encrypt(){
|
||||
# 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
|
||||
# This function, given a recipient, $PUBKEY; a file to encrypt, $TMP_NOTE; and an
|
||||
# output file, "$NOTE", will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
|
||||
# GPG key.
|
||||
|
||||
gpg -r "$PUBKEY" -o "$NOTE" -e "$TARGET"
|
||||
gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE"
|
||||
|
||||
}
|
||||
|
||||
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
|
||||
# This function, given a recipient, $PUBKEY; a file to decrypt, $TMP_NOTE; and an
|
||||
# output file, "$NOTE", will decrpyt $TMP_NOTE to $NOTE against $PUBKEY's private
|
||||
# GPG key.
|
||||
echo "$NOTE"; pause
|
||||
gpg -d "$NOTE"
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
function list(){
|
||||
if [ -d "$BASE_DIR"/"$NOTEBOOK" ]; then
|
||||
if [ -d "$NOTES_DIR"/"$NOTEBOOK" ]; then
|
||||
printf "+%s\n" "$NOTEBOOK"
|
||||
find "$BASE_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
|
||||
find "$NOTES_DIR"/"$NOTEBOOK" -type f | while read -r NOTE; do
|
||||
printf " -%s\n" "$(basename \"$NOTE\" | cut -d . -f 1 )"
|
||||
done
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user