Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/postinstall postinstall: ensure SRC_DIR and DEST_DI...



details:   https://anonhg.NetBSD.org/src/rev/2719b45e4396
branches:  trunk
changeset: 961897:2719b45e4396
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Apr 25 00:36:47 2021 +0000

description:
postinstall: ensure SRC_DIR and DEST_DIR are quoted

diffstat:

 usr.sbin/postinstall/postinstall.in |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 19bea86e80c3 -r 2719b45e4396 usr.sbin/postinstall/postinstall.in
--- a/usr.sbin/postinstall/postinstall.in       Sun Apr 25 00:29:52 2021 +0000
+++ b/usr.sbin/postinstall/postinstall.in       Sun Apr 25 00:36:47 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall.in,v 1.34 2021/04/25 00:29:52 lukem Exp $
+# $NetBSD: postinstall.in,v 1.35 2021/04/25 00:36:47 lukem Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1599,7 +1599,7 @@
 {
        if $SOURCEMODE; then
                ${SED} -n -e "/obsolete/s@\.$1$2[[:space:]].*@\1@p" \
-                   ${SRC_DIR}/distrib/sets/lists/$3/mi
+                   "${SRC_DIR}/distrib/sets/lists/$3/mi"
                return
        fi
 
@@ -1610,9 +1610,9 @@
        local obsolete_dir
 
        if [ $3 = "etc" ] ;then
-               obsolete_dir=${SRC_DIR}/var/db/obsolete
+               obsolete_dir="${SRC_DIR}/var/db/obsolete"
        else
-               obsolete_dir=${DEST_DIR}/var/db/obsolete
+               obsolete_dir="${DEST_DIR}/var/db/obsolete"
        fi
        ${SED} -n -e "s@\.$1$2\$@\1@p" "${obsolete_dir}/$3"
 }
@@ -2397,7 +2397,7 @@
                echo "@ARCHSUBDIRS@"
        else
                ${SED} -n -e '/ARCHDIR_SUBDIR/s/[[:space:]]//gp' \
-                   ${SRC_DIR}/compat/archdirs.mk
+                   "${SRC_DIR}/compat/archdirs.mk"
        fi
 }
 



Home | Main Index | Thread Index | Old Index