dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup uci and functions.sh

Browse Source 
SVN-Revision: 5597
v19.07.3_mercusys_ac12_duma
Mike Baker 18 years ago
parent c541a3939b
commit faf1eba5be
2 changed files with 124 additions and 104 deletions
Show Stats Download Patch File Download Diff File

137
package/base-files/default/bin/uci
Unescape Escape View File

@ -21,33 +21,44 @@
. /etc/functions.sh . /etc/functions.sh
include /lib/config include /lib/config
SEP="[^0-9A-Za-z_]"
do_get() { do_get() {
[ $# -ne 3 ] && { local PACKAGE
local CONFIG
local OPTION
local DUMMY
strtok "$*" PACKAGE . CONFIG . OPTION $SEP DUMMY
[ $? -ne 3 ] && {
uci_usage get uci_usage get
exit 1 exit 1
} }
local PACKAGE="$1"
local CONFIG="$2"
local OPTION="$3"
uci_load "$PACKAGE" uci_load "$PACKAGE"
config_get "$CONFIG" "$OPTION" config_get "$CONFIG" "$OPTION"
} }
do_set() { do_set() {
[ $# -ne 4 ] && { local PACKAGE
uci_usage set local CONFIG
exit 1 local OPTION
} local VALUE
uci_set "$@"
}
do_add() { strtok "$1" PACKAGE . CONFIG = VALUE
[ $# -ne 3 ] && { [ $? -ne 3 ] && {
uci_usage add uci_usage set
exit 1 exit 1
} }
uci_add "$@"
strtok "$CONFIG" CONFIG . OPTION
if [ $? -eq 1 ]; then
uci_add "$PACKAGE" "$VALUE" "$CONFIG"
else
uci_set "$PACKAGE" "$CONFIG" "$OPTION" "$VALUE"
fi
} }
do_rename() { do_rename() {
@ -59,78 +70,86 @@ do_rename() {
} }
do_remove() { do_remove() {
[ $# -ne 3 -a $# -ne 2 ] && { local PACKAGE
local CONFIG
local OPTION
local DUMMY
strtok "$*" PACKAGE . CONFIG . OPTION $SEP DUMMY
[ $? -ne 3 -a $? -ne 2 ] && {
uci_usage rename uci_usage rename
exit 1 exit 1
} }
uci_remove "$@" uci_remove "$PACKAGE" "$CONFIG" ${OPTION:+"$OPTION"}
} }
do_commit() { do_commit() {
[ $# -ne 1 ] && { local PACKAGE="$1"
uci_usage commit for package in ${PACKAGE:-$(cd /tmp/.uci; ls)}; do
exit 1 uci_commit "$package"
} done
uci_commit "$1"
} }
do_show() { do_show() {
[ $# -gt 2 -o $# -lt 1 ] && { local PACKAGE
local CONFIG
local DUMMY
strtok "$*" PACKAGE . CONFIG $SEP DUMMY
[ $? -gt 2 ] && {
uci_usage show uci_usage show
exit 1 exit 1
} }
PACKAGE="$1" for package in ${PACKAGE:-$(cd /etc/config; ls)}; do
CONFIG="$2" SECTION=""
SECTION=""
config_cb() { config_cb() {
if [ -z "$CONFIG" -o "$CONFIG" = "$2" ]; then if [ -z "$CONFIG" -o "$CONFIG" = "$2" ]; then
append SECTION "$2" append SECTION "$2"
option_cb() { option_cb() {
append "${CONFIG_SECTION}_VARS" "$1" append "${CONFIG_SECTION}_VARS" "$1"
} }
else else
option_cb() { option_cb() {
return 0 return 0
} }
fi fi
} }
uci_load "$PACKAGE" uci_load "$package"
for section in $SECTION; do for section in $SECTION; do
config_get type "$section" TYPE config_get type "$section" TYPE
[ -z "$type" ] && continue [ -z "$type" ] && continue
echo "@$section=$type" echo "$package.$section=$type"
eval "VARS=\"\${${section}_VARS}\"" eval "VARS=\"\${${section}_VARS}\""
for var in $VARS; do for var in $VARS; do
config_get val "$section" "$var" config_get val "$section" "$var"
[ -n "$val" ] && { [ -n "$val" ] && {
echo "${section}.${var}=${val}" echo "$package.$section.$var=$val"
config_set "$section" "$var" "" config_set "$section" "$var" ""
} }
done
config_set "$section" TYPE ""
done done
config_set "$section" TYPE ""
done done
} }
uci_usage() { uci_usage() {
case "$1" in case "$1" in
show) echo "$0 show <package> [<config>]";; show) echo "$0 show [<package>[.<config>]]";;
get) echo "$0 get <package> <config> <option>";; get) echo "$0 get <package>.<config>.<option>";;
set) echo "$0 set <package> <config> <option> <value>";; set) echo "$0 set <package>.<config>[.<option>]=<value>";;
add) echo "$0 add <package> <type> <config>";; del) echo "$0 del <package>.<config>[.<option>]";;
del) echo "$0 del <package> <config> [<option>]";;
rename) echo "$0 rename <package> <config> <name>";; rename) echo "$0 rename <package> <config> <name>";;
commit) echo "$0 commit <package>";; commit) echo "$0 commit [<package> ... ]";;
*) *)
echo "Syntax: $0 <command> <arguments...>" echo "Syntax: $0 <command> <arguments...>"
echo echo
uci_usage show uci_usage show
uci_usage get uci_usage get
uci_usage set uci_usage set
uci_usage add
uci_usage del uci_usage del
uci_usage rename uci_usage rename
uci_usage commit uci_usage commit
@ -144,11 +163,11 @@ if [ $# -eq 0 ] ; then
uci_usage uci_usage
exit 0 exit 0
fi fi
CMD="$1"
local CMD="$1"
shift shift
case "$CMD" in case "$CMD" in
set) do_set "$@";; set) do_set "$@";;
add) do_add "$@";;
del) do_remove "$@";; del) do_remove "$@";;
rename) do_rename "$@";; rename) do_rename "$@";;
get) do_get "$@";; get) do_get "$@";;

91
package/base-files/default/etc/functions.sh
Unescape Escape View File

@ -18,48 +18,48 @@ append() {
local var="$1" local var="$1"
local value="$2" local value="$2"
local sep="${3:- }" local sep="${3:- }"
eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}\$value\""
eval "$var=\"\${$var:+\${$var}${value:+$sep}}$value\""
} }
reset_cb() { reset_cb() {
config_cb() { config_cb() { return 0; }
return 0 option_cb() { return 0; }
}
option_cb() {
return 0
}
} }
reset_cb reset_cb
config () { config () {
local cfgtype="$1" local cfgtype="$1"
local name="$2" local name="$2"
_C=$(($_C + 1))
name="${name:-cfg${_C}}" _C=$((_C + 1))
config_cb "$cfgtype" "$name" name="${name:-cfg${_C}}"
export CONFIG_SECTION="$name" config_cb "$cfgtype" "$name"
export CONFIG_${CONFIG_SECTION}_TYPE="$cfgtype" CONFIG_SECTION="$name"
eval CONFIG_${CONFIG_SECTION}_TYPE="$cfgtype"
} }
option () { option () {
local varname="$1"; shift local varname="$1"; shift
export CONFIG_${CONFIG_SECTION}_${varname}="$*"
eval CONFIG_${CONFIG_SECTION}_${varname}="$*"
option_cb "$varname" "$*" option_cb "$varname" "$*"
} }
config_rename() { config_rename() {
local OLD="$1" local OLD="$1"
local NEW="$2" local NEW="$2"
local oldsetting local oldvar
local newvar local newvar
[ -z "$OLD" -o -z "$NEW" ] && return [ "$OLD" -a "$NEW" ] || return
for oldsetting in `set | grep ^CONFIG_${OLD}_ | \ for oldvar in `set | grep ^CONFIG_${OLD}_ | \
sed -e 's/\(.*\)=.*$/\1/'` ; do sed -e 's/\(.*\)=.*$/\1/'` ; do
newvar="CONFIG_${NEW}_${oldsetting##CONFIG_${OLD}_}" newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
eval "${newvar}=\${$oldsetting}" eval "$newvar=\${$oldvar}"
unset "$oldsetting" unset "$oldvar"
done done
[ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW" [ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW"
} }
@ -68,38 +68,36 @@ config_unset() {
} }
config_clear() { config_clear() {
[ -z "$CONFIG_SECTION" ] && return local SECTION="$1"
for oldsetting in `set | grep ^CONFIG_${CONFIG_SECTION}_ | \ local oldvar
for oldvar in `set | grep ^CONFIG_${SECTION}_ | \
sed -e 's/\(.*\)=.*$/\1/'` ; do sed -e 's/\(.*\)=.*$/\1/'` ; do
unset $oldsetting unset $oldvar
done done
unset CONFIG_SECTION
} }
config_load() { config_load() {
CONFIG_SECTION= local file="/etc/config/$1"
local DIR="./"
_C=0 _C=0
[ \! -e "$1" -a -e "/etc/config/$1" ] && { CONFIG_SECTION=
DIR="/etc/config/"
} [ -e "$file" ] && {
[ -e "$DIR$1" ] && { . $file
CONFIG_FILENAME="$DIR$1"
. ${CONFIG_FILENAME}
} || return 1 } || return 1
${CD:+cd -} >/dev/null
${CONFIG_SECTION:+config_cb} ${CONFIG_SECTION:+config_cb}
} }
config_get() { config_get() {
case "$3" in case "$3" in
"") eval "echo \"\${CONFIG_${1}_${2}}\"";; "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
*) eval "$1=\"\${CONFIG_${2}_${3}}\"";; *) eval "$1=\"\${CONFIG_${2}_${3}}\"";;
esac esac
} }
config_set() { config_set() {
export CONFIG_${1}_${2}="${3}" eval CONFIG_${1}_${2}="$3"
} }
load_modules() { load_modules() {
@ -107,6 +105,8 @@ load_modules() {
} }
include() { include() {
local file
for file in $(ls $1/*.sh 2>/dev/null); do for file in $(ls $1/*.sh 2>/dev/null); do
. $file . $file
done done
@ -114,30 +114,31 @@ include() {
find_mtd_part() { find_mtd_part() {
local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')" local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
PART="${PART##mtd}" PART="${PART##mtd}"
echo "${PART:+/dev/mtdblock/$PART}" echo "${PART:+/dev/mtdblock/$PART}"
} }
strtok() { # <string> <variable> [<separator>] ... strtok() { # <string> { <variable> [<separator>] ... }
local right local tmp
local left="$1" local val="$1"
local count=0 local count=0
shift shift
while [ $# -gt 1 ]; do while [ $# -gt 1 ]; do
right="${left%%$2*}" tmp="${val%%$2*}"
[ "$right" = "$left" ] && break [ "$tmp" = "$val" ] && break
left="${left#$right$2}" val="${val#$tmp$2}"
export $1="$right"; count=$((count+1)) eval $1="$tmp"; count=$((count+1))
shift 2 shift 2
done done
if [ $# -gt 0 -a "$left" ]; then if [ $# -gt 0 -a "$val" ]; then
export $1="$left"; count=$((count+1)) eval $1="$val"; count=$((count+1))
fi fi
return $count return $count

Write Preview
Loading…
Cancel
Save