Merge pull request #18 from Vikingat-RAGE/main

Added configuration file for x2go

diff --git a/README.md b/README.md
index 81efa9bb8c98f691e1c03f3b09d065b5a554e05c..d4e3349315d58fe4a047293e1a7dc431e76fa39a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This will run every test in the default configuration.
 
 ## Dependencies
 
-- [bash](https://repology.org/project/bash/packages), obviously
+- your favorite POSIX-compliant shell ([bash](https://repology.org/project/bash/packages), [zsh](https://repology.org/project/zsh/packages), [dash](https://repology.org/project/dash-shell/packages), ...)
 - [jq](https://repology.org/project/jq/packages) for parsing the json files
 
 ### Optional
@@ -43,10 +43,10 @@ Files in this directory can have any name, but using the name of the program is
 
 ### Automatically Generating Configuration
 
-You need _haskell_ and _cabal_ installed. (To be clear, this is just for a tool that will help you automatically generate the config files, you still only need bash to run the tests)
+You need _haskell_ and _cabal_ installed. (To be clear, this is just for a tool that will help you automatically generate the config files, you still only need your shell to run the tests)
 
 Run the following command:
-```bash
+```sh
 cabal build
 ```
 
@@ -63,13 +63,13 @@ It puts the file _.gitconfig_ into _$HOME.
 Luckily, the XDG spec is supported by git, so we can simply move the file to _XDG_CONFIG_HOME/git/config_.
 
 We can use that last sentence as our instructions. In this case, there are no newlines, so escaping this string for use in json is trivial, however, this is how you should generally approach it:
-```bash
+```sh
 echo "Luckily, the XDG spec is supported by git, so we can simply move the file to _XDG_CONFIG_HOME/git/config_." | jq -aRs .
 ```
 
 Let's see what the output of this command looks like for something a little more sophisticated.
 Here's an example file:
-```bash
+```sh
 cat example.md
 ```
 ```
@@ -78,7 +78,7 @@ Currently not fixable.
 _(But you can probably just delete the dir)_
 ```
 Here's what catting this file to the _jq_ command produces:
-```bash
+```sh
 cat example.md | jq -aRs .
 ```
 ```

diff --git a/programs/xorg-xrdb.json b/programs/xorg-xrdb.json
index f2fa5ff855b6af859a11bc9f2cf8bfd619d1de52..63c29d2fdb38c9af23b54569694f7f0ea164981b 100644 (file)
--- a/programs/xorg-xrdb.json
+++ b/programs/xorg-xrdb.json
@@ -3,8 +3,8 @@
         {
             "path": "$HOME/.Xresources",
             "movable": true,
-            "help": "xrdb loads these resources, wherever you call xrdb, add this flag:\n\n```bash\nxrdb -load \"$XDG_CONFIG_HOME/.config/X11/xresources\"\n```\n\n_Note: It will probably be called by your Xsession file._\n"
+            "help": "xrdb loads these resources, wherever you call xrdb, add this flag:\n\n```bash\nxrdb -load \"$XDG_CONFIG_HOME/X11/xresources\"\n```\n\n_Note: It will probably be called by your Xsession file._\n"
         }
     ],
     "name": "xorg-xrdb"
-}
\ No newline at end of file
+}

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 869046c6c066f3550c36eb1459397b794101112f..aa751bd307c4bc063308e2ef61aaefe5f0950e36 100755 (executable)
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 # shellcheck disable=SC2016
 
 USE_GLOW=true
@@ -172,14 +172,16 @@ check_program() {
 
     while IFS= read -r file; do
         check_file "$file" "$NAME"
-    done <<<"$(printf "%s" "$INPUT" | jq -rc '.files[]')"
+    done <<EOF
+$(echo "$INPUT" | jq -rc '.files[]')
+EOF
 }
 
 # Loops over all files in the programs/ directory and calls check_program
 enumerate_programs() {
     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
+    for prog_filename in "${0%/*}"/programs/*; do
         check_program "$(cat "$prog_filename")"
     done
     printf "\e[1;3mDone checking your \e[1;36m\$HOME.\e[1;0m\n"