remove superfluous quotes in parameter expansion

as this breaks busybox hush shell.
offending functions can be found with
grep -r '${[^}]*"[^}]*}'
master
Norbert Lange 2018-12-12 17:21:12 +01:00 committed by Harald Hoyer
parent ebe1821635
commit f9c96cf56f
4 changed files with 11 additions and 11 deletions

View File

@ -129,7 +129,7 @@ setup_net() {
for _p in $(getargs rd.route); do for _p in $(getargs rd.route); do
route_to_var "$_p" || continue route_to_var "$_p" || continue
[ -n "$route_dev" ] && [ "$route_dev" != "$netif" ] && continue [ -n "$route_dev" ] && [ "$route_dev" != "$netif" ] && continue
ip route add "$route_mask" ${route_gw:+via "$route_gw"} ${route_dev:+dev "$route_dev"} ip route add "$route_mask" ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}
if strstr "$route_mask" ":"; then if strstr "$route_mask" ":"; then
printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \ printf -- "%s\n" "$route_mask ${route_gw:+via $route_gw} ${route_dev:+dev $route_dev}" \
> /tmp/net.route6."$netif" > /tmp/net.route6."$netif"

View File

@ -2,7 +2,7 @@
if [ -z $iscsi_lun ]; then if [ -z $iscsi_lun ]; then
iscsi_lun=0 iscsi_lun=0
fi fi
NEWROOT=${NEWROOT:-"/sysroot"} NEWROOT=${NEWROOT:-/sysroot}


for disk in /dev/disk/by-path/*-iscsi-*-$iscsi_lun; do for disk in /dev/disk/by-path/*-iscsi-*-$iscsi_lun; do
if mount -t ${fstype:-auto} -o "$rflags" $disk $NEWROOT; then if mount -t ${fstype:-auto} -o "$rflags" $disk $NEWROOT; then

View File

@ -57,7 +57,7 @@ mount_root() {


# we want rootflags (rflags) to take precedence so prepend rootopts to # we want rootflags (rflags) to take precedence so prepend rootopts to
# them; rflags is guaranteed to not be empty # them; rflags is guaranteed to not be empty
rflags="${rootopts:+"${rootopts},"}${rflags}" rflags="${rootopts:+${rootopts},}${rflags}"


umount "$NEWROOT" umount "$NEWROOT"



View File

@ -24,7 +24,7 @@ debug_on() {


# returns OK if $1 contains literal string $2 (and isn't empty) # returns OK if $1 contains literal string $2 (and isn't empty)
strstr() { strstr() {
[ "${1##*"$2"*}" != "$1" ] [ "${1##*$2*}" != "$1" ]
} }


# returns OK if $1 matches (completely) glob pattern $2 # returns OK if $1 matches (completely) glob pattern $2
@ -43,18 +43,18 @@ strglobin() {


# returns OK if $1 contains literal string $2 at the beginning, and isn't empty # returns OK if $1 contains literal string $2 at the beginning, and isn't empty
str_starts() { str_starts() {
[ "${1#"$2"*}" != "$1" ] [ "${1#$2*}" != "$1" ]
} }


# returns OK if $1 contains literal string $2 at the end, and isn't empty # returns OK if $1 contains literal string $2 at the end, and isn't empty
str_ends() { str_ends() {
[ "${1%*"$2"}" != "$1" ] [ "${1%*$2}" != "$1" ]
} }


trim() { trim() {
local var="$*" local var="$*"
var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters var="${var#${var%%[![:space:]]*}}" # remove leading whitespace characters
var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters var="${var%${var##*[![:space:]]}}" # remove trailing whitespace characters
printf "%s" "$var" printf "%s" "$var"
} }


@ -108,9 +108,9 @@ str_replace() {
local out='' local out=''


while strstr "${in}" "$s"; do while strstr "${in}" "$s"; do
chop="${in%%"$s"*}" chop="${in%%$s*}"
out="${out}${chop}$r" out="${out}${chop}$r"
in="${in#*"$s"}" in="${in#*$s}"
done done
echo "${out}${in}" echo "${out}${in}"
} }
@ -396,7 +396,7 @@ splitsep() {
while [ -n "$str" -a "$#" -gt 1 ]; do while [ -n "$str" -a "$#" -gt 1 ]; do
tmp="${str%%$sep*}" tmp="${str%%$sep*}"
eval "$1='${tmp}'" eval "$1='${tmp}'"
str="${str#"$tmp"}" str="${str#$tmp}"
str="${str#$sep}" str="${str#$sep}"
shift shift
done done