xenami/vns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SNSv2' of alfheim.central.xn:xilmwa/sns into SNSv2

Browse Source
This commit is contained in:
Jon-William Lewis
2016-02-15 19:41:48 -06:00
parent 167ec44008 6105190e78
commit 495a3db4c9
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/bash-completion/sns
View File

@@ -47,6 +47,7 @@ _sns_complete_entries () {
[[ -d $item ]] && item="$item/" [[ -d $item ]] && item="$item/"
item="${item%$suffix}" item="${item%$suffix}"
item="${item%.gpg}"
COMPREPLY+=("${item#$prefix}") COMPREPLY+=("${item#$prefix}")
done done
} }

2
src/includes/create.sns.sh
View File

@@ -29,7 +29,7 @@ function create(){
if [ -e "$NOTES_DIR/$NOTE" ]; then if [ -e "$NOTES_DIR/$NOTE" ]; then
printf " - %s\n" "Created note: ${NOTE%.*}" printf " - %s\n" "Created note: ${NOTE%.*}"
else else
>&2 printf " $RED_COLOR!$RESET_COLOR%s\n"\ >&2 printf " $RED_COLOR!$RESET_COLOR %s\n"\
"Something went wrong, and the note was not created." "Something went wrong, and the note was not created."
fi fi
} }

8
src/includes/edit.sns.sh
View File

@@ -17,7 +17,7 @@ fi
# If encryption is enabled, decrypt $NOTE to a temp file, otherwise # If encryption is enabled, decrypt $NOTE to a temp file, otherwise
# operate on the note directly. # operate on the note directly.
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
cp "$NOTES_DIR/$NOTE" "$NOTES_DIR$/$NOTE".bk #Insurance cp "$NOTES_DIR/$NOTE" "$NOTES_DIR/$NOTE.bk" #Insurance
TMP_NOTE="$TMP_DIR/$SESSION_ID" TMP_NOTE="$TMP_DIR/$SESSION_ID"
decrypt > "$TMP_NOTE" decrypt > "$TMP_NOTE"
else else
@@ -26,7 +26,7 @@ fi
# Write an ammendment header # Write an ammendment header
if [ -z "$CREATE" ]; then if [ -z "$CREATE" ]; then
printf "\n%s\n" "edit - $(date $DATE_FMT)" >> "$TMP_NOTE" printf "\n%s\n" "edit - $(date "$DATE_FMT")" >> "$TMP_NOTE"
printf "%s\n" "===================================" >> "$TMP_NOTE" printf "%s\n" "===================================" >> "$TMP_NOTE"
fi fi
@@ -36,9 +36,11 @@ printf " - %s\n" "editing ${NOTE%.*}"
# If the file was previously decrypted, encrypt it back # If the file was previously decrypted, encrypt it back
if [ "$ENCRYPTION" == "TRUE" ]; then if [ "$ENCRYPTION" == "TRUE" ]; then
echo "reencrypting"
rm "$NOTES_DIR/$NOTE" rm "$NOTES_DIR/$NOTE"
encrypt; encrypt;
if [ ! -r "$NOTE" ]; then rm "$TMP_NOTE"
if [ ! -r "$NOTES_DIR/$NOTE" ]; then
>&2 printf " $RED_COLOR!$RESET_COLOR %s\n" "error: note was not saved." >&2 printf " $RED_COLOR!$RESET_COLOR %s\n" "error: note was not saved."
cp "$NOTES_DIR/$NOTE.bk" "$NOTES_DIR/$NOTE" cp "$NOTES_DIR/$NOTE.bk" "$NOTES_DIR/$NOTE"
else else

2
src/includes/init_store.sns.sh
View File

@@ -16,7 +16,7 @@ EXT=note # File extension to use (for listing notes)
DATE_FMT="+%D %T" # Date Format: DATE_FMT="+%D %T" # Date Format:
# If you would like to modify the date format, you may # If you would like to modify the date format, you may
# specify one appropriate to the `date` command. # specify one appropriate to the \`date\` command.
ENCRYPTION="FALSE" # Main Encryption Toggle: ENCRYPTION="FALSE" # Main Encryption Toggle:
# WARNING: ANY PREVIOUSLY UNENCRYPTED NOTES WILL BE LOST # WARNING: ANY PREVIOUSLY UNENCRYPTED NOTES WILL BE LOST

4
src/includes/libencryption.sns.sh
View File

@@ -3,7 +3,7 @@ function encrypt(){
# output file, $NOTE, will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private # output file, $NOTE, will encrypt $TMP_NOTE to $NOTE against $PUBKEY's private
# GPG key. # GPG key.
gpg -r "$PUBKEY" -o "$NOTE" -e "$TMP_NOTE" gpg -r "$PUBKEY" -o "$NOTES_DIR/$NOTE" -e "$TMP_NOTE"
} }
@@ -11,5 +11,5 @@ function decrypt(){
# This function, given a file to decrypt, will attempt to decrypt the file # This function, given a file to decrypt, will attempt to decrypt the file
# against the specified recipient's private key, and print the result to # against the specified recipient's private key, and print the result to
# stdout. # stdout.
gpg -d "$NOTE" gpg -d "$NOTES_DIR/$NOTE"
} }

2
src/includes/p_header.sh
View File

@@ -1,3 +1,3 @@
function p_header(){ function p_header(){
printf "# %s\n## Date: %s\n" "$(basename ${NOTE%.*})" "$(date "$DATE_FMT")" printf "# %s\n## %s\n" "$(basename ${NOTE%.*})" "$(date "$DATE_FMT")"
} }