Fixes a bad grep pattern caused by dffd6e0

Fixes #233
Get rid of errors by using grep -E
2025-08-01 13:23:28 +02:00 · 2022-10-13 16:32:48 -04:00 · 2022-10-05 22:36:33 -03:00 · 2022-10-05 22:36:33 -03:00 · 2022-10-05 22:36:33 -03:00
1 changed files with 7 additions and 9 deletions
--- a/scripts/beesd.in
+++ b/scripts/beesd.in
@@ -31,20 +31,18 @@ help(){
    exec "$bees_bin" --help
 }

-get_bees_supp_opts(){
-    "$bees_bin" --help |& awk '/--../ { gsub( ",", "" ); print $1 " " $2}'
-}
-
-SUPPORTED_ARGS=(
-    $(get_bees_supp_opts)
-)
+for i in $("$bees_bin" --help 2>&1 | grep -E " --" | sed -e "s/^[^-]*-/-/" -e "s/,[^-]*--/ --/" -e "s/ [^-]*$//")
+do
+   TMP_ARGS="$TMP_ARGS $i"
+done
+IFS=" " read -r -a SUPPORTED_ARGS <<< $TMP_ARGS
 NOT_SUPPORTED_ARGS=()
 ARGUMENTS=()

 for arg in "${@}"; do
    supp=false
    for supp_arg in "${SUPPORTED_ARGS[@]}"; do
-        if [ "$arg" == "$supp_arg" ]; then
+        if [[ "$arg" == ${supp_arg}* ]]; then
            supp=true
            break
        fi
@@ -73,7 +71,7 @@ done
 [ -z "$UUID" ] && help


-FILE_CONFIG="$(egrep -l '^[^#]*UUID\s*=\s*"?'"$UUID" "$CONFIG_DIR"/*.conf | head -1)"
+FILE_CONFIG="$(grep -E -l '^[^#]*UUID\s*=\s*"?'"$UUID" "$CONFIG_DIR"/*.conf | head -1)"
 [ ! -f "$FILE_CONFIG" ] && ERRO "No config for $UUID"
 INFO "Find $UUID in $FILE_CONFIG, use as conf"
 source "$FILE_CONFIG"
Author	SHA1	Message	Date
KhalilSantana	27857406f5	Fixes a bad grep pattern caused by `dffd6e0` Fixes #233	2022-10-13 16:32:48 -04:00
Khalil Santana	b44ed287dd	Get rid of errors by using grep -E "egrep: warning: egrep is obsolescent; using grep -E"	2022-10-05 22:36:33 -03:00
Ayla Ounce	20c469245c	Fix beesd script arg parsing to respect PREFIX Without this, if you install to a different PREFIX such as /usr/local it will fail to recognize any arguments and if you use the systemd unit, that makes --no-timestamps the first NOT_SUPPORTED_ARG which will get passed to uuidparse, which doesn't recognize it and errors.	2022-10-05 22:36:33 -03:00
Javi Vilarroig	77cf2d794e	Minimal changes in beesd script to make it functional in my system	2022-10-05 22:36:33 -03:00