[type/__uci] Add --type parameter

This commit is contained in:
Dennis Camera 2020-10-24 12:57:40 +02:00
parent fe26c119b5
commit 0840afce03
4 changed files with 146 additions and 19 deletions

View file

@ -117,9 +117,26 @@ in
exit 0 exit 0
fi fi
if test "$(wc -l "${__object:?}/parameter/value")" -gt 1 # Determine type
then type=$(cat "${__object:?}/parameter/type" 2>/dev/null || true)
# "should" is a list case ${type}
in
(option|list) ;;
('')
# Guess type by the number of values
test "$(wc -l "${__object:?}/parameter/value")" -gt 1 \
&& type=list \
|| type=option
;;
(*)
printf 'Invalid --type: %s\n' "${type}" >&2
exit 1
;;
esac
case ${type}
in
(list)
printf 'set_list %s\n' "${config}" >>"${__messages_out:?}" printf 'set_list %s\n' "${config}" >>"${__messages_out:?}"
if test "${state_is}" != 'absent' if test "${state_is}" != 'absent'
@ -131,13 +148,14 @@ in
do do
uci_cmd add_list "${config}"="${value}" uci_cmd add_list "${config}"="${value}"
done <"${__object:?}/parameter/value" done <"${__object:?}/parameter/value"
else ;;
# "should" is a scalar (option)
printf 'set %s\n' "${config}" >>"${__messages_out:?}" printf 'set %s\n' "${config}" >>"${__messages_out:?}"
value=$(cat "${__object:?}/parameter/value") value=$(cat "${__object:?}/parameter/value")
uci_cmd set "${config}"="${value}" uci_cmd set "${config}"="${value}"
fi ;;
esac
;; ;;
(absent) (absent)
if in_list "${state_is}" 'absent' if in_list "${state_is}" 'absent'

View file

@ -0,0 +1,101 @@
#!/bin/sh -e
#
# 2020 Dennis Camera (dennis.camera@ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
# shellcheck source=files/functions.sh
. "${__type:?}/files/functions.sh"
state_is=$(cat "${__object:?}/explorer/state")
state_should=$(cat "${__object:?}/parameter/state")
config=${__object_id:?}
uci_validate_tuple "${config}"
case ${state_should}
in
(present)
if in_list "${state_is}" 'present' 'rearranged'
then
# NOTE: order is ignored so rearranged is also fine.
exit 0
fi
# Determine type
type=$(cat "${__object:?}/parameter/type" 2>/dev/null || true)
case ${type}
in
(option|list) ;;
('')
# Guess type by the number of values
test "$(wc -l "${__object:?}/parameter/value")" -gt 1 \
&& type=list \
|| type=option
;;
(*)
printf 'Invalid --type: %s\n' "${type}" >&2
exit 1
;;
esac
case ${type}
in
(list)
printf 'set_list %s\n' "${config}" >>"${__messages_out:?}"
if test "${state_is}" != 'absent'
then
uci_cmd delete "${config}"
fi
while read -r value
do
uci_cmd add_list "${config}"="${value}"
done <"${__object:?}/parameter/value"
;;
(option)
printf 'set %s\n' "${config}" >>"${__messages_out:?}"
value=$(cat "${__object:?}/parameter/value")
uci_cmd set "${config}"="${value}"
;;
esac
;;
(absent)
if in_list "${state_is}" 'absent'
then
exit 0
fi
printf 'delete %s\n' "${config}" >>"${__messages_out:?}"
uci_cmd delete "${config}"
;;
(*)
printf 'Invalid --state: %s\n' "${state_should}" >&2
exit 1
;;
esac
if test -s "${__object:?}/files/uci_batch.txt"
then
cat "${__type:?}/files/uci_apply.sh"
printf "uci_apply <<'EOF'\n"
cat "${__object:?}/files/uci_batch.txt"
printf '\nEOF\n'
fi

View file

@ -31,6 +31,10 @@ state
transaction transaction
The name of the transaction this option belongs to. The name of the transaction this option belongs to.
If none is given: ``default`` is used. If none is given: ``default`` is used.
type
If the type should generate an option or a list.
One of: ``option`` or ``list``.
Defaults to auto-detect based on the number of ``--value`` parameters.
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
@ -46,10 +50,13 @@ EXAMPLES
# Set the system hostname # Set the system hostname
__uci system.@system[0].hostname --value 'OpenWrt' __uci system.@system[0].hostname --value 'OpenWrt'
# Set DHCP option 252: tell DHCP clients to not ask for proxy information.
__uci dhcp.lan.dhcp_option --type list --value '252,"\n"'
# Enable NTP and NTPd (in one transaction) # Enable NTP and NTPd (in one transaction)
__uci system.ntp.enabled --value 1 --transaction ntp __uci system.ntp.enabled --value 1 --transaction ntp
__uci system.ntp.enable_server --value 1 --transaction ntp __uci system.ntp.enable_server --value 1 --transaction ntp
__uci system.ntp.server --transaction ntp \ __uci system.ntp.server --type list --transaction ntp \
--value '0.openwrt.pool.ntp.org' \ --value '0.openwrt.pool.ntp.org' \
--value '1.openwrt.pool.ntp.org' \ --value '1.openwrt.pool.ntp.org' \
--value '2.openwrt.pool.ntp.org' \ --value '2.openwrt.pool.ntp.org' \

View file

@ -1,2 +1,3 @@
state state
transaction transaction
type