Commit a37489af authored by Emeric Verschuur's avatar Emeric Verschuur

Fix enumeration type to support values with spaces

parent 10b57ec7
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
set -e set -e
BASHOPTS_VERSION=2.1.0 BASHOPTS_VERSION=2.1.1
bashopts_exit_handle() { bashopts_exit_handle() {
local err=$? local err=$?
...@@ -256,7 +256,7 @@ bashopts_declare() { ...@@ -256,7 +256,7 @@ bashopts_declare() {
-l) options[long_opt]=$1; shift;; -l) options[long_opt]=$1; shift;;
-d) options[description]=$1; shift;; -d) options[description]=$1; shift;;
-t) options[type]=$1; shift;; -t) options[type]=$1; shift;;
-e) options_enum_values+=($1); shift;; -e) options_enum_values+=("$1");shift;;
-m) options[method]=$1; shift;; -m) options[method]=$1; shift;;
-k) options[check]=$1; shift;; -k) options[check]=$1; shift;;
-s) options[setting]="true";; -s) options[setting]="true";;
...@@ -280,7 +280,7 @@ bashopts_declare() { ...@@ -280,7 +280,7 @@ bashopts_declare() {
if [ ${#options_enum_values[@]} -lt 2 ]; then if [ ${#options_enum_values[@]} -lt 2 ]; then
bashopts_log C "bashopts_declare: ${options[name]} enumeration need at least two elements (two '-e <val>' calls at least)" bashopts_log C "bashopts_declare: ${options[name]} enumeration need at least two elements (two '-e <val>' calls at least)"
fi fi
options[enum_values]="$(IFS=$'\n'; echo "${options_enum_values[*]}")" options[enum_values]="$(printf "%s\n" "${options_enum_values[@]}")"
;; ;;
s|str|string) s|str|string)
options[type]="string" options[type]="string"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment