knazarov/notes.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linter errors

Browse source
This commit is contained in:
Konstantin Nazarov 2021-06-19 19:50:27 +00:00
parent 42e507ec0a
commit f327471f37
Signed by: knazarov
GPG key ID: 4CFE0A42FA409C22
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
notes.sh
View file

@ -253,11 +253,6 @@ unpack_mime() {
FILE="$1" FILE="$1"
DIR="$2" DIR="$2"
DATE=$(get_header "$FILE" X-Date)
SUBJECT=$(get_header "$FILE" Subject)
MIME_TYPE=$(get_header "$FILE" Content-Type)
NOTE_ID=$(get_header "$FILE" X-Note-Id)
get_headers "$FILE" | grep -v "^Content-Type\|^Content-Disposition\|^Date\|^MIME-Version" >> "$DIR/note.md" get_headers "$FILE" | grep -v "^Content-Type\|^Content-Disposition\|^Date\|^MIME-Version" >> "$DIR/note.md"
echo "" >> "$DIR/note.md" echo "" >> "$DIR/note.md"
@ -369,7 +364,6 @@ input_note() {
MERGED_ENTRY_FILE="$(mktemp)" MERGED_ENTRY_FILE="$(mktemp)"
HEADERS=$(get_headers "$ENTRY_FILE") HEADERS=$(get_headers "$ENTRY_FILE")
BODY="$(get_body "$ENTRY_FILE")"
{ {
echo "$HEADERS" | grep -q "^X-Date:" || echo "X-Date: $UTC_TIMESTAMP" echo "$HEADERS" | grep -q "^X-Date:" || echo "X-Date: $UTC_TIMESTAMP"
echo "$HEADERS" | grep -q "^X-Note-Id:" || echo "X-Note-Id: $(uuid)" echo "$HEADERS" | grep -q "^X-Note-Id:" || echo "X-Note-Id: $(uuid)"
@ -408,19 +402,19 @@ notes_equal() {
FILTER1="^Date:" FILTER1="^Date:"
FILTER2="^Date:" FILTER2="^Date:"
if [ ! -z "$BOUNDARY1" ]; then if [ -n "$BOUNDARY1" ]; then
FILTER1="^Date:\|$BOUNDARY1" FILTER1="^Date:\|$BOUNDARY1"
fi fi
if [ ! -z "$BOUNDARY2" ]; then if [ -n "$BOUNDARY2" ]; then
FILTER2="^Date:\|$BOUNDARY2" FILTER2="^Date:\|$BOUNDARY2"
fi fi
NOTE1_S="$(mktemp)" NOTE1_S="$(mktemp)"
cat "$NOTE1" | grep -v "$FILTER1" > "$NOTE1_S" grep -v "$FILTER1" "$NOTE1" > "$NOTE1_S"
if cat "$NOTE2" | grep -v "$FILTER2" | cmp -s "$NOTE1_S"; then if grep -v "$FILTER2" "$NOTE2" | cmp -s "$NOTE1_S"; then
rm "$NOTE1_S" rm "$NOTE1_S"
return 0 return 0
else else
@ -441,7 +435,7 @@ new_entry() {
NOTE_ID="$(get_header "$OUTP" X-Note-Id)" NOTE_ID="$(get_header "$OUTP" X-Note-Id)"
OLD_NOTE="$(find_file_by_id "$NOTE_ID")" OLD_NOTE="$(find_file_by_id "$NOTE_ID")"
if [ ! -z "$OLD_NOTE" ] && notes_equal "$OLD_NOTE" "$OUTP"; then if [ -n "$OLD_NOTE" ] && notes_equal "$OLD_NOTE" "$OUTP"; then
return return
fi fi