X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/blobdiff_plain/0e4ada6e9f469f9eafe61f8335fc3cd01927f878..6efc7cf13187ec9ae2bff84f52a0a77449625ae4:/xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 6c8a2f2..2044432 100755
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -1,16 +1,30 @@
 #!/usr/bin/env sh
 
+has_command() {
+    command -v "$1" >/dev/null 2>/dev/null
+    return $?
+}
+
 USE_GLOW=false
 USE_BAT=false
-if command -v glow >/dev/null 2>/dev/null; then
+USE_PYGMENTIZE=false
+USE_HIGHLIGHT=false
+if has_command glow; then
     USE_GLOW=true
-elif command -v bat >/dev/null 2>/dev/null; then
-    USE_BAT=true
-    printf "Glow not found, markdown rendering will be done by bat.\n"
-    printf "Install glow for easier reading & copy-paste.\n"
 else
-    printf "Glow or bat not found, markdown rendering not available.\n"
-    printf "Output will be raw markdown and might look weird.\n"
+    if has_command bat; then
+        USE_BAT=true
+        printf "Markdown rendering will be done by bat. (Glow is recommended)\n"
+    elif has_command pygmentize; then
+        printf "Markdown rendering will be done by pygmentize. (Glow is recommended)\n"
+        USE_PYGMENTIZE=true
+    elif has_command highlight; then
+        printf "Markdown rendering will be done by highlight. (Glow is recommended)\n"
+        USE_HIGHLIGHT=true
+    else
+        printf "Markdown rendering not available. (Glow is recommended)\n"
+        printf "Output will be raw markdown and might look weird.\n"
+    fi
     printf "Install glow for easier reading & copy-paste.\n"
 fi
 
@@ -98,8 +112,10 @@ check_if_file_exists() {
 }
 
 decode_string() {
-    printf "%s\n" "$1" | sed -e 's/\\n/\
-/g' -e 's/\\\"/\"/g' # Replace \n with literal newline and \" with "
+    printf "%s" "$1" | sed -e 's/\\n/\
+/g' -e 's/\\\"/\"/g' -e '$ s/\n*$/\
+\
+/' # Replace \n with literal newline and \" with ", normalize number of trailing newlines to 2
 }
 
 # Function to handle the formatting of output
@@ -129,10 +145,15 @@ log() {
         ;;
 
     HELP)
-        if $USE_GLOW; then
+        if [ "$USE_GLOW" = true ]; then
             decode_string "$HELP" | glow -
-        elif $USE_BAT; then
+        elif [ "$USE_BAT" = true ]; then
             decode_string "$HELP" | bat -pp --decorations=always --color=always --language markdown
+        elif [ $USE_PYGMENTIZE = true ]; then
+            decode_string "$HELP" | pygmentize -l markdown
+            printf "\n"
+        elif [ $USE_HIGHLIGHT = true ]; then
+            decode_string "$HELP" | highlight --out-format ansi --syntax markdown
         else
             decode_string "$HELP"
         fi
@@ -157,7 +178,7 @@ check_file() {
         ;;
 
     1)
-        if "$MOVABLE"; then
+        if [ "$MOVABLE" = true ]; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else
             log WARN "$NAME" "$FILENAME" "$HELP"