X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/blobdiff_plain/5eeeda0ad50d4814881e3dfc3930d7905d287794..bf9f62a814c9860d53bfb71d6e5b5d23a82c6922:/xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 2f3b5f8..59d9dc4 100755
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 USE_GLOW=true
-if ! command -v glow &>/dev/null; then
-    echo "Glow not found, markdown rendering not available."
-    echo "Output will be raw markdown and might look weird."
-    echo "Install glow for easier reading & copy-paste."
+if ! command -v glow >/dev/null 2>/dev/null; then
+    printf "Glow not found, markdown rendering not available."
+    printf "Output will be raw markdown and might look weird."
+    printf "Install glow for easier reading & copy-paste."
     USE_GLOW=false
 fi
 
@@ -31,14 +31,14 @@ HELPSTRING="""\
 
 SKIP_OK=true
 for i in "$@"; do
-    if [ $i == "--help" ] || [ $i == "-h" ]; then
-        echo -e "$HELPSTRING"
+    if [ "$i" = "--help" ] || [ "$i" = "-h" ]; then
+        printf "%b" "$HELPSTRING"
         exit
-    elif [ $i == "--skip-ok" ]; then
+    elif [ "$i" = "--skip-ok" ]; then
         SKIP_OK=true
-    elif [ $i == "--no-skip-ok" ]; then
+    elif [ "$i" = "--no-skip-ok" ]; then
         SKIP_OK=false
-    elif [ $i == "-v" ]; then
+    elif [ "$i" = "-v" ]; then
         SKIP_OK=false
     fi
 done
@@ -64,17 +64,19 @@ if [ -z "${XDG_RUNTIME_DIR}" ]; then
     printf '\e[1;36m    ⤷ \e[1mThe recommended value is: \e[1;3m/run/user/$UID\e[1;0m\n'
 fi
 
-if ! command -v jq &>/dev/null; then
-    echo "jq is needed to run this script, but it wasn't found. Please install it to be able to use this script."
+if ! command -v jq >/dev/null 2>/dev/null; then
+    printf "jq is needed to run this script, but it wasn't found. Please install it to be able to use this script."
     exit
 fi
 
+printf "\n"
+
 # Function to expand environment variables in string
 # https://stackoverflow.com/a/20316582/11110290
 apply_shell_expansion() {
-    declare data="$1"
-    declare delimiter="__apply_shell_expansion_delimiter__"
-    declare command="cat <<$delimiter"$'\n'"$data"$'\n'"$delimiter"
+    data="$1"
+    delimiter="__apply_shell_expansion_delimiter__"
+    command=$(printf "cat <<%s\n%s\n%s" "$delimiter" "$data" "$delimiter")
     eval "$command"
 }
 
@@ -119,9 +121,9 @@ log() {
 
     HELP)
         if $USE_GLOW; then
-            echo "$HELP" | glow -
+            printf "%s" "$HELP" | glow -
         else
-            echo "$HELP"
+            printf "%s" "$HELP"
         fi
         ;;
 
@@ -133,9 +135,9 @@ check_file() {
     INPUT="$1"
     NAME="$2"
 
-    FILENAME=$(echo -E "$INPUT" | jq -r .path)
-    MOVABLE=$(echo -E "$INPUT" | jq -r .movable)
-    HELP=$(echo -E "$INPUT" | jq -r .help)
+    FILENAME=$(printf "%s" "$INPUT" | jq -r .path)
+    MOVABLE=$(printf "%s" "$INPUT" | jq -r .movable)
+    HELP=$(printf "%s" "$INPUT" | jq -r .help)
 
     check_not_exists_file "$FILENAME"
 
@@ -165,24 +167,24 @@ check_file() {
 check_program() {
     INPUT=$1
 
-    NAME=$(echo "$INPUT" | jq -r .name)
+    NAME=$(printf "%s" "$INPUT" | jq -r .name)
 
     while IFS= read -r file; do
         check_file "$file" "$NAME"
-    done <<<"$(echo "$INPUT" | jq -rc '.files[]')"
+    done <<<"$(printf "%s" "$INPUT" | jq -rc '.files[]')"
 }
 
 # Loops over all files in the programs/ directory and calls check_program
 enumerate_programs() {
-    echo -e "\e[1;3mStarting to check your \e[1;36m\$HOME.\e[1;0m"
-    echo -e ""
+    printf "\e[1;3mStarting to check your \e[1;36m\$HOME.\e[1;0m\n"
+    printf "\n"
 	for prog_filename in "$(dirname "${BASH_SOURCE[0]}")"/programs/*; do
         check_program "$(cat "$prog_filename")"
     done
-    echo -e "\e[1;3mDone checking your \e[1;36m\$HOME.\e[1;0m"
-    echo -e ""
-    echo -e "\e[3mIf you have files in your \e[1;36m\$HOME\e[1;0m that shouldn't be there, but weren't recognised by xdg-ninja, please consider creating a configuration file for it and opening a pull request on github.\e[1;0m"
-    echo -e ""
+    printf "\e[1;3mDone checking your \e[1;36m\$HOME.\e[1;0m\n"
+    printf "\n"
+    printf "\e[3mIf you have files in your \e[1;36m\$HOME\e[1;0m that shouldn't be there, but weren't recognised by xdg-ninja, please consider creating a configuration file for it and opening a pull request on github.\e[1;0m\n"
+    printf "\n"
 }
 
 enumerate_programs