fix busybox --help problems on rebuild

[openwrt.git] / package / base-files / files / lib / config / uci.sh

diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
index e1571cc..a539388 100644 (file)
--- a/package/base-files/files/lib/config/uci.sh
+++ b/package/base-files/files/lib/config/uci.sh
@@ -39,26 +39,41 @@ uci_apply_defaults() {(
        uci commit
 )}
 
+uci_call_awk() {
+       local CMD="$*"
+       awk -f $UCI_ROOT/lib/config/uci.awk -f - <<EOF
+BEGIN {
+       $CMD
+}
+EOF
+}
+
 uci_do_update() {
        local FILENAME="$1"
        local UPDATE="$2"
-       awk -f $UCI_ROOT/lib/config/uci-update.awk -f - <<EOF
-BEGIN {
-       config = read_file("$FILENAME")
+       uci_call_awk "
+       config = read_file(\"$FILENAME\")
        $UPDATE
        print config
-}
-EOF
+"
 }
 
 uci_add_update() {
        local PACKAGE="$1"
        local UPDATE="$2"
        local PACKAGE_BASE="$(basename "$PACKAGE")"
-       
+       local UCIFILE
+
+       case "$PACKAGE" in
+               /*) UCIFILE="$PACKAGE";;
+               *)
+                       UCIFILE="/tmp/.uci/$PACKAGE_BASE"
+                       mkdir -p "/tmp/.uci"
+               ;;
+       esac
+
        # FIXME: add locking?
-       mkdir -p "/tmp/.uci"
-       echo "$UPDATE" >> "/tmp/.uci/${PACKAGE_BASE}"
+       echo "$UPDATE" >> "$UCIFILE"
 }
 
 uci_set() {
@@ -67,11 +82,21 @@ uci_set() {
        local OPTION="$3"
        local VALUE="$4"
 
-       ( # spawn a subshell so you don't mess up the current environment
-               uci_load "$PACKAGE"
-               config_get type "$CONFIG" TYPE
-               [ -z "$type" ]
-       ) || uci_add_update "$PACKAGE" "CONFIG_SECTION='$CONFIG'${N}option '$OPTION' '$VALUE'"
+       case "$PACKAGE" in
+               /*)
+                       uci_add_update "$PACKAGE" "config_set '$CONFIG' '$OPTION' '$VALUE'"
+               ;;
+               *)
+                       ( # spawn a subshell so you don't mess up the current environment
+                               uci_load "$PACKAGE"
+                               config_get OLDVAL "$CONFIG" "$OPTION"
+                               if [ "x$OLDVAL" != "x$VALUE" ]; then
+                                       config_get type "$CONFIG" TYPE
+                                       [ -z "$type" ]
+                               fi
+                       ) || uci_add_update "$PACKAGE" "config_set '$CONFIG' '$OPTION' '$VALUE'"
+               ;;
+       esac
 }
 
 uci_add() {
@@ -106,6 +131,9 @@ uci_commit() {
        local PACKAGE="$1"
        local PACKAGE_BASE="$(basename "$PACKAGE")"
 
+       case "$PACKAGE" in
+               /*) return 0;;
+       esac
        mkdir -p /tmp/.uci
        LOCK=`which lock` || LOCK=:
        $LOCK "/tmp/.uci/$PACKAGE_BASE.lock"
@@ -114,19 +142,19 @@ uci_commit() {
                
                # replace handlers
                config() {
-                       append updatestr "config = update_config(config, \"@$2=$1\")" "$N"
+                       append updatestr "config = uci_update_config(config, \"@$2=$1\")" "$N"
                }
                option() {
-                       append updatestr "config = update_config(config, \"$CONFIG_SECTION.$1=$2\")" "$N"
+                       append updatestr "config = uci_update_config(config, \"$CONFIG_SECTION.$1=$2\")" "$N"
                }
                config_rename() {
-                       append updatestr "config = update_config(config, \"&$1=$2\")" "$N"
+                       append updatestr "config = uci_update_config(config, \"&$1=$2\")" "$N"
                }
                config_unset() {
-                       append updatestr "config = update_config(config, \"-$1.$2\")" "$N"
+                       append updatestr "config = uci_update_config(config, \"-$1.$2\")" "$N"
                }
                config_clear() {
-                       append updatestr "config = update_config(config, \"-$1\")" "$N"
+                       append updatestr "config = uci_update_config(config, \"-$1\")" "$N"
                }
                
                . "/tmp/.uci/$PACKAGE_BASE"