denisidoro#60 names can include dashes or spaces

fengyuxx · Sep 28, 2019 · 913d303 · 913d303
1 parent d55b572
commit 913d303
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/arg.sh b/src/arg.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ARG_REGEX="<[0-9a-zA-Z_]+>"
+ARG_REGEX="<[0-9a-zA-Z]+([_-\[[:space:]]]*[0-9a-zA-Z]+)*>"
 ARG_DELIMITER="\f"
 ARG_DELIMITER_2="\v"
 

diff --git a/src/main.sh b/src/main.sh
@@ -38,6 +38,10 @@ handler::main() {
          break
       fi
 
+      newArg=$(echo "$arg" | sed -e 's/-/_/g;s/ /_/g')
+      cmd=$(echo "$cmd" | sed "s|<${arg}>|<${newArg}>|g")
+      arg=$newArg
+
       value="$(arg::pick "$arg" "$cheat" || echo "")"
       if [ -z "$value" ]; then
          echoerr "Unable to fetch suggestions for '$arg'!"