diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-17 19:31:05 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-17 19:31:05 +0000 |
| commit | 87d2c422466c7f3e783f9a430c2824e5619868ba (patch) | |
| tree | 5834a1354b25dfa440bebb5e0dbc9e7be1b422c6 | |
| parent | 15b63637b4acc1f474148c160cda9f07be351dd0 (diff) | |
[package] uci: add uci_get() and uci_get_state() wrappers to shell api (#7312)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21489 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/uci/files/lib/config/uci.sh | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh index 851a0d779b..d759615bd5 100644 --- a/package/uci/files/lib/config/uci.sh +++ b/package/uci/files/lib/config/uci.sh @@ -1,6 +1,7 @@ #!/bin/sh # Shell script compatibility wrappers for /sbin/uci # +# Copyright (C) 2008-2010 OpenWrt.org # Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org> # # This program is free software; you can redistribute it and/or modify @@ -41,9 +42,9 @@ uci_load() { uci_set_default() { local PACKAGE="$1" - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$1" > /dev/null && return 0 - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$1" - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$1" + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0 + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE" + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE" } uci_revert_state() { @@ -73,6 +74,23 @@ uci_set() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE" } +uci_get_state() { + uci_get "$1" "$2" "$3" "$4" "/var/state" +} + +uci_get() { + local PACKAGE="$1" + local CONFIG="$2" + local OPTION="$3" + local DEFAULT="$4" + local STATE="$5" + + /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" + RET="$?" + [ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT" + return "$RET" +} + uci_add() { local PACKAGE="$1" local TYPE="$2" |