Clone/future-install-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: add support for getting optstr values

Browse Source
This commit is contained in:
Dave Reisner 2013-12-08 16:43:34 -05:00
parent 03121cb504
commit 80466e0412
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common
View File

@ -166,19 +166,19 @@ optstring_match_option() {
} }
optstring_remove_option() { optstring_remove_option() {
local i options_ remove=$2 IFS=, local o options_ remove=$2 IFS=,
read -ra options_ <<<"${!1}" read -ra options_ <<<"${!1}"
for i in "${!options_[@]}"; do for o in "${!options_[@]}"; do
optstring_match_option "$remove" "${options_[i]}" && unset 'options_[i]' optstring_match_option "$remove" "${options_[o]}" && unset 'options_[o]'
done done
declare -g "$1=${options_[*]}" declare -g "$1=${options_[*]}"
} }
optstring_normalize() { optstring_normalize() {
local IFS=, o options_ norm local o options_ norm IFS=,
read -ra options_ <<<"${!1}" read -ra options_ <<<"${!1}"
@ -209,17 +209,26 @@ optstring_prepend_option() {
optstring_normalize "$1" optstring_normalize "$1"
} }
optstring_has_option() { optstring_get_option() {
local opts o local opts o
IFS=, read -ra opts <<<"${!1}" IFS=, read -ra opts <<<"${!1}"
for o in "${opts[@]}"; do for o in "${opts[@]}"; do
optstring_match_option "$2" "$o" && return 0 if optstring_match_option "$2" "$o"; then
declare -g "$o"
return 0
fi
done done
return 1 return 1
} }
optstring_has_option() {
local "${2%%=*}"
optstring_get_option "$1" "$2"
}
dm_name_for_devnode() { dm_name_for_devnode() {
read dm_name <"/sys/class/block/${1#/dev/}/dm/name" read dm_name <"/sys/class/block/${1#/dev/}/dm/name"
if [[ $dm_name ]]; then if [[ $dm_name ]]; then

6
test/test_option_twiddling
View File

@ -24,6 +24,12 @@ EXPECT_success optstring_has_option optstring pgrp
EXPECT_failure optstring_has_option optstring maxproto=6 EXPECT_failure optstring_has_option optstring maxproto=6
EXPECT_success optstring_has_option optstring maxproto EXPECT_success optstring_has_option optstring maxproto
EXPECT_failure optstring_get_option optstring proto
EXPECT_success optstring_get_option optstring maxproto
ASSERT_streq "$maxproto" "5"
EXPECT_success optstring_get_option optstring timeout
ASSERT_streq "$timeout" "300"
optstring_remove_option optstring pgrp optstring_remove_option optstring pgrp
ASSERT_streq "$optstring" 'rw,relatime,timeout=300,minproto=5,maxproto=5,direct' ASSERT_streq "$optstring" 'rw,relatime,timeout=300,minproto=5,maxproto=5,direct'