Module Name: src
Committed By: jym
Date: Tue Sep 6 14:08:05 UTC 2011
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Check that $TGZMODE is true to deduce that the set is extracted
from a .tgz instead of checking that $SRC_DIR != $SRC_ARG. These variables
can be modified in different places, so it's less error prone.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.122 src/usr.sbin/postinstall/postinstall:1.123
--- src/usr.sbin/postinstall/postinstall:1.122 Tue Aug 9 18:24:46 2011
+++ src/usr.sbin/postinstall/postinstall Tue Sep 6 14:08:05 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.122 2011/08/09 18:24:46 jmmv Exp $
+# $NetBSD: postinstall,v 1.123 2011/09/06 14:08:05 jym Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1805,7 +1805,7 @@
list)
echo "Source directory: ${SRC_DIR:-/}"
echo "Target directory: ${DEST_DIR:-/}"
- if [ "${SRC_DIR}" != "${SRC_ARG}" ]; then
+ if $TGZMODE; then
echo " (extracted from: ${SRC_ARG})"
fi
list
@@ -1825,7 +1825,7 @@
# perform each check/fix
#
echo "Source directory: ${SRC_DIR:-/}"
- if [ "${SRC_DIR}" != "${SRC_ARG}" ]; then
+ if $TGZMODE; then
echo " (extracted from: ${SRC_ARG})"
fi
echo "Target directory: ${DEST_DIR:-/}"
