Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/postinstall Quoting fixes in several eval commands.
details: https://anonhg.NetBSD.org/src/rev/a56bb9924051
branches: trunk
changeset: 331492:a56bb9924051
user: apb <apb%NetBSD.org@localhost>
date: Tue Aug 12 08:32:43 2014 +0000
description:
Quoting fixes in several eval commands.
diffstat:
usr.sbin/postinstall/postinstall | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (56 lines):
diff -r 5aa0f09fb1cf -r a56bb9924051 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall Tue Aug 12 08:28:04 2014 +0000
+++ b/usr.sbin/postinstall/postinstall Tue Aug 12 08:32:43 2014 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.177 2014/08/12 08:28:04 apb Exp $
+# $NetBSD: postinstall,v 1.178 2014/08/12 08:32:43 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -186,7 +186,7 @@
{
[ $# -eq 2 ] || err 3 "USAGE: additem item description"
defaultitems="${defaultitems}${defaultitems:+ }$1"
- eval desc_$1=\"$2\"
+ eval desc_$1=\"\$2\"
}
# adddisableditem item description
@@ -197,7 +197,7 @@
{
[ $# -eq 2 ] || err 3 "USAGE: adddisableditem item description"
otheritems="${otheritems}${otheritems:+ }$1"
- eval desc_$1=\"$2\"
+ eval desc_$1=\"\$2\"
}
# checkdir op dir mode
@@ -430,7 +430,7 @@
_rcie_var="$1"
(
[ -f "${DEST_DIR}/etc/rc.conf" ] && . "${DEST_DIR}/etc/rc.conf"
- eval _rcie_val="\${${_rcie_var}}"
+ eval _rcie_val=\"\${${_rcie_var}}\"
case $_rcie_val in
# "yes", "true", "on", or "1"
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
@@ -524,7 +524,7 @@
if [ "${op}" = "check" ]; then
msg "Remove obsolete ${ftype} ${ofile}"
failed=1
- elif ! eval "${cmd} \${ofile}"; then
+ elif ! eval "${cmd} \"\${ofile}\""; then
msg "Can't remove obsolete ${ftype} ${ofile}"
failed=1
else
@@ -718,7 +718,7 @@
_value="$(echo '.include <bsd.own.mk>' | \
${MAKE} -f - -V "${_var}")"
- eval ${_var}=\"${_value}\"
+ eval ${_var}=\"\${_value}\"
done
}
Home |
Main Index |
Thread Index |
Old Index