improved POSIX

src/main.sh

@@ -136,7 +136,7 @@ if [ "${1:-}" = "--archive" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
   tagmod="$(echo " $TAG_INBOX $TAGS_NEW" | sed "s/\s\(\S\)/ -\1/g")"
   $NOTMUCH tag $tagmod "$query"
   exit
@@ -147,14 +147,14 @@ if [ "${1:-}" = "--delete" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
   $NOTMUCH tag -$TAG_INBOX +$TAG_DEL "$query"
   exit
 fi
 
 if [ "${1:-}" = "--undelete" ]; then
   shift
-  query="$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ thread:\1/g")"
   $NOTMUCH tag -$TAG_DEL "$query"
   exit
 fi
@@ -164,7 +164,7 @@ if [ "${1:-}" = "--flag" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
   $NOTMUCH tag +"$TAG_FLAGGED" "$query"
   exit
 fi
@@ -174,7 +174,7 @@ if [ "${1:-}" = "--unflag" ]; then
   [ "$1" = "thread" ] && thread=1
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
   $NOTMUCH tag -"$TAG_FLAGGED" "$query"
   exit
 fi
@@ -182,11 +182,10 @@ fi
 
 if [ "${1:-}" = "--purge" ]; then
   shift
-  # query="$(echo " $@" | sed "s/\s\(\S*\)/ (thread:\1 and tag:del)/g" | sed 's/)\(\s\+\)(/) or (/g')"
+  query="tag:$TAG_DEL and ($(echo " $*" | sed "s/\s\(\S\)/ thread:\1/g"))"
-  query="tag:$TAG_DEL and ("$(echo " $@" | sed "s/\s\(\S\)/ thread:\1/g")")"
   files=$(nm_files_all "$query")
   if ynprompt "Are you sure you want to purge these files?" "$files"; then
-    echo -n "$files" | xargs -d "\n" rm
+    printf '%s' "$files" | xargs -d "\n" rm
     nm_new
   fi
   exit
@@ -199,7 +198,7 @@ if [ "${1:-}" = "--tag-modify" ]; then
   [ "$1" = "add" ] && sign=+ || sign=-
   shift
   [ "${thread:-}" ] && field="thread" || field="id"
-  query="$(echo " $@" | sed "s/\s\(\S\)/ $field:\1/g")"
+  query="$(echo " $*" | sed "s/\s\(\S\)/ $field:\1/g")"
   if [ "$sign" = "+" ]; then
     tagquery=""
     label_text="Add tag"
@@ -220,7 +219,7 @@ if [ "${1:-}" = "--tag-modify" ]; then
     --border=double \
     --border-label="  $label_text  " | head -1 || true)
   [ "$res" ] || exit
-  $NOTMUCH tag $sign$res "$query"
+  $NOTMUCH tag "$sign$res" "$query"
   exit
 fi
 
@@ -432,6 +431,7 @@ while true; do
     --bind="$KEYS_VIEW_LOGS:execute:$0 --view-logs" \
     --bind="$KEYS_SYNC:execute($0 --sync)+reload:$0 --list-threads \"$nmquery\"" \
     --bind="$KEYS_COMPOSE:execute:$0 --compose" \
+    --bind="$KEYS_GOTO_FIRST:first" \
     --bind="focus:change-preview:$0 --preview-thread {4}" \
     --preview="$0 --preview-thread {4}" \
     --preview-window="$FZF_DEFAULT_PREVIEW_WINDOW" | head -1 || true)
@@ -503,9 +503,9 @@ while true; do
 	--border=double \
 	--border-label='  Query history  ' | head -1 || true)
       ;;
-    $CMD_GOTO_INBOX) nmquery="tag:$TAG_INBOX" ;;
+    "$CMD_GOTO_INBOX") nmquery="tag:$TAG_INBOX" ;;
-    $CMD_GOTO_UNREAD) nmquery="tag:$TAG_UNREAD" ;;
+    "$CMD_GOTO_UNREAD") nmquery="tag:$TAG_UNREAD" ;;
-    $CMD_GOTO_FLAGGED) nmquery="tag:$TAG_FLAGGED" ;;
+    "$CMD_GOTO_FLAGGED") nmquery="tag:$TAG_FLAGGED" ;;
     *)
       ;;
   esac

src/sh/history.sh

@@ -1,5 +1,6 @@
 if [ ! "${HISTORY_LOADED:-}" ]; then
-  export NMFHIST=$(mktemp)
+  NMFHIST="$(mktemp)"
+  export NMFHIST
   touch "$NMFHIST"
   trap 'rm -f "$NMFHIST"' EXIT INT
 

src/sh/keys.sh

@@ -24,6 +24,7 @@ if [ ! "${KEYS_LOADED:-}" ]; then
   KEYS_COMPOSE="ctrl-n"
   KEYS_VIEW_LOGS="alt-0"
   KEYS_SYNC="ctrl-s"
+  KEYS_GOTO_FIRST="home"
 
   # Preview window
   KEYS_PREVIEW_DOWN="alt-j"
@@ -52,12 +53,12 @@ if [ ! "${KEYS_LOADED:-}" ]; then
     KEYS_ENTER_ALTERNATIVE KEYS_CYCLE_DISPLAY KEYS_VIEW_SOURCE \
     KEYS_HTML_PREVIEW KEYS_TAG_ADD KEYS_TAG_REMOVE KEYS_ARCHIVE KEYS_DELETE \
     KEYS_FLAG KEYS_UNFLAG KEYS_OPEN KEYS_REPLY KEYS_COMPOSE KEYS_VIEW_LOGS \
-    KEYS_SYNC KEYS_PREVIEW_DOWN KEYS_PREVIEW_UP KEYS_PREVIEW_DOWN_HP \
+    KEYS_SYNC KEYS_GOTO_FIRST KEYS_PREVIEW_DOWN KEYS_PREVIEW_UP KEYS_PREVIEW_DOWN_HP \
     KEYS_PREVIEW_UP_HP KEYS_PREVIEW_TOGGLE_SIZE KEYS_SEARCH_TAG_REPLCE \
     KEYS_SEARCH_TAG_APPEND KEYS_SEARCH_FROM_REPLCE KEYS_SEARCH_FROM_APPEND \
     KEYS_SEARCH_TO_REPLCE KEYS_SEARCH_TO_APPEND KEYS_SEARCH_EDIT_QUERY \
     KEYS_SEARCH_DELETED KEYS_SEARCH_INBOX KEYS_SEARCH_UNREAD \
-    KEYS_SEARCH_FLAGGED
+    KEYS_SEARCH_FLAGGED KEYS_PURGE_ALL
 
   export KEYS_LOADED=1
 fi

src/sh/preview.sh

@@ -11,7 +11,6 @@
 # @argument #3: if set, then the HTML messages will be taken
 preview_message() {
   [ "$1" = "id" ] && messageid="$2" || messageid="$(nm_last_message_in_thread "$2")"
-  parts="$(nm_message_parts "$messageid")"
   html="${3:-}"
   nr="$(nm_message_part_nr "$messageid" "$html")"
   [ ! "$nr" ] && [ ! "$html" ] && html="html" && nr="$(nm_message_part_nr "$messageid" "html")"

src/sh/send.sh

@@ -2,12 +2,12 @@
 # @argument $1: Path to email file
 # @argument $2: if set, don't prompt the user (optional)
 send() {
-  if [ ! "${2:-}" ] && ! ynprompt "Do you want to send this email?" "$($CATEMAIL $tmpfile)"; then
+  if [ ! "${2:-}" ] && ! ynprompt "Do you want to send this email?" "$($CATEMAIL "$tmpfile")"; then
     return
   fi
   $MSMTP -t --read-envelope-from -X "$SMTPLOGFILE" < "$1" >/dev/null 2>&1 || true
   log=$(tail -1 "$SMTPLOGFILE")
-  if [ "${2:-}" ] || echo -n "$log" | grep -q '\bsmtpstatus=250\b'; then
+  if [ "${2:-}" ] || printf '%s' "$log" | grep -q '\bsmtpstatus=250\b'; then
     return
   fi
   # Handle errors

src/sh/varia.sh

@@ -5,7 +5,7 @@
 # @argument $2: Content to show in preview window
 # @return: 0 if the user answered "yes" and 1 otherwise.
 ynprompt() {
-  return $(printf '0 \033[32myes\033[0m\n1 \033[31mno\033[0m\n' |
+  return "$(printf '0 \033[32myes\033[0m\n1 \033[31mno\033[0m\n' |
     $FZF \
     --sync \
     --bind='start:pos(2)' \
@@ -19,7 +19,7 @@ ynprompt() {
     --with-nth=2.. \
     --accept-nth=1 \
     --header-border='line' \
-    --color='border:yellow,header:yellow')
+    --color='border:yellow,header:yellow')"
 }
 
 # This prompts the user for a series of options.