From 5e6f8739be1b3de38ed7ad1c7dc80bc1f4c4bf31 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 15 Jun 2007 15:59:56 +0000 Subject: some shell variable handling fixes SVN-Revision: 7638 --- package/base-files/files/etc/functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/base-files/files/etc/functions.sh') diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh index 7ba59af..8d11171 100755 --- a/package/base-files/files/etc/functions.sh +++ b/package/base-files/files/etc/functions.sh @@ -55,7 +55,7 @@ config_rename() { local oldvar local newvar - [ "$OLD" -a "$NEW" ] || return + [ -n "$OLD" -a -n "$NEW" ] || return for oldvar in `set | grep ^CONFIG_${OLD}_ | \ sed -e 's/\(.*\)=.*$/\1/'` ; do newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}" @@ -139,7 +139,7 @@ config_foreach() { [ -z "$CONFIG_SECTIONS" ] && return 0 for section in ${CONFIG_SECTIONS}; do config_get cfgtype "$section" TYPE - [ -n "$type" -a "$cfgtype" != "$type" ] && continue + [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue eval "$function \"\$section\"" done } @@ -186,7 +186,7 @@ strtok() { # { [] ... } shift 2 done - if [ $# -gt 0 -a "$val" ]; then + if [ $# -gt 0 -a -n "$val" ]; then export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1)) fi -- cgit v1.1