From 01141b711939b12463921f15918c24559fa1c6ce Mon Sep 17 00:00:00 2001 From: NRK Date: Wed, 14 Apr 2021 08:49:43 +0600 Subject: [PATCH] cleanups grep -w isnt posix compliant the awk command to list all bookmarks isnt either need to rewrite the entire thing to be posix compliant also need to figure out a sane and posix compliant way to colorize the output --- sxbm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sxbm b/sxbm index 2f314d8..4670b8a 100755 --- a/sxbm +++ b/sxbm @@ -91,19 +91,21 @@ bm_list(){ [ -n "$QUERY_TAG" ] && [ -n "$QUERY_TITLE" ] && eval grep -w -n "$QUERY_TAG" "$DATA_FILE" | - eval grep -i "$QUERY_TITLE" + eval grep -i "$QUERY_TITLE" | + sed 's/:/) /;s/+.*//g;s/ *$//' [ -n "$QUERY_TAG" ] && [ -z "$QUERY_TITLE" ] && - eval grep -w -n "$QUERY_TAG" "$DATA_FILE" + eval grep -w -n "$QUERY_TAG" "$DATA_FILE" | + sed 's/:/) /;s/+.*//g;s/ *$//' [ -z "$QUERY_TAG" ] && [ -n "$QUERY_TITLE" ] && - eval grep -i -n "$QUERY_TITLE" "$DATA_FILE" + eval grep -i -n "$QUERY_TITLE" "$DATA_FILE" | + sed 's/:/) /;s/+.*//g;s/ *$//' [ -z "$QUERY_TAG" ] && [ -z "$QUERY_TITLE" ] && - awk -v COL_LINK="$COL_LINK" -v COL_TITLE="$COL_TITLE" \ - -v COL_LINE_NUM=$COL_LINE_NUM -v QUERY_TITLE="$QUERY_TITLE" \ - ' BEGIN{IGNORECASE=1} - $0 ~ QUERY_TITLE { LINK=$1; $1=""; + awk -v COL_LINE_NUM=$COL_LINE_NUM \ + -v COL_TITLE="$COL_TITLE" -v COL_LINK="$COL_LINK" \ + ' { LINK=$1; $1=""; gsub(/+\w+/,""); print COL_LINE_NUM NR ") " COL_LINK LINK " " COL_TITLE $0 ; }' \ "$DATA_FILE"