summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant>2003-12-21 01:21:52 +0000
committergrant <grant>2003-12-21 01:21:52 +0000
commita678961080c4cc08878111041a514d22cfa1384c (patch)
tree81f51b5a965a6bb6fcfb9e0d7e6dd5003555e566
parent304e980da7483662855d991c3a8021fd168f14dd (diff)
downloadpkgsrc-a678961080c4cc08878111041a514d22cfa1384c.tar.gz
tweak a message and some formatting.
-rw-r--r--mk/install/install30
1 files changed, 16 insertions, 14 deletions
diff --git a/mk/install/install b/mk/install/install
index 9a8f3f37983..e76194698bc 100644
--- a/mk/install/install
+++ b/mk/install/install
@@ -1,6 +1,6 @@
# start of install
#
-# $NetBSD: install,v 1.28 2003/11/23 07:14:43 jlam Exp $
+# $NetBSD: install,v 1.29 2003/12/21 01:21:52 grant Exp $
if [ -z "${CONF_FILES}" -a -z "${CONF_FILES_PERMS}" -a \
-z "${SUPPORT_FILES}" -a -z "${SUPPORT_FILES_PERMS}" -o \
@@ -221,7 +221,8 @@ POST-INSTALL)
[ "${_PKG_RCD_SCRIPTS}" = "YES" -a \
-n "${RCD_SCRIPTS}" ]; then
${CAT} << EOF
-Installing configuration files for ${PKGNAME}:
+
+===> Installing configuration/support files for ${PKGNAME}
EOF
fi
@@ -242,12 +243,12 @@ EOF
msgadd "#${file} (m=@CONF_FILES_MODE@)"
elif [ -e "${file}" ]; then
if [ ! "${file}" -ef "${samplefile}" ]; then
- ${ECHO} " ${file} already exists, example file is"
- ${ECHO} " ${samplefile}"
+ ${ECHO} " ${file} already exists, example file is"
+ ${ECHO} " ${samplefile}"
fi
else
if [ -e "${samplefile}" ]; then
- ${ECHO} " ${file}"
+ ${ECHO} " ${file}"
${CP} "${samplefile}" "${file}"
${CHMOD} @CONF_FILES_MODE@ "${file}"
fi
@@ -268,12 +269,12 @@ EOF
msgadd "#${file} (m=@SUPPORT_FILES_MODE@)"
elif [ -e "${file}" ]; then
if [ ! "${file}" -ef "${samplefile}" ]; then
- ${ECHO} " ${file} already exists, example file is"
- ${ECHO} " ${samplefile}"
+ ${ECHO} " ${file} already exists, example file is"
+ ${ECHO} " ${samplefile}"
fi
else
if [ -e "${samplefile}" ]; then
- ${ECHO} " ${file}"
+ ${ECHO} " ${file}"
${CP} "${samplefile}" "${file}"
${CHMOD} @SUPPORT_FILES_MODE@ "${file}"
fi
@@ -295,12 +296,12 @@ EOF
msgadd "#${file} (o=${owner}, g=${group}, m=${mode})"
elif [ -e ${file} ]; then
if [ ! "${file}" -ef "${samplefile}" ]; then
- ${ECHO} " ${file} already exists, example file is"
- ${ECHO} " ${samplefile}"
+ ${ECHO} " ${file} already exists, example file is"
+ ${ECHO} " ${samplefile}"
fi
else
if [ -e "${samplefile}" ]; then
- ${ECHO} " ${file}"
+ ${ECHO} " ${file}"
${CP} "${samplefile}" "${file}"
${CHOWN} "${owner}" "${file}"
${CHGRP} "${group}" "${file}"
@@ -324,12 +325,12 @@ EOF
msgadd "#${file} (m=@RCD_SCRIPTS_MODE@)"
elif [ -e "${file}" ]; then
if [ ! "${file}" -ef "${samplefile}" ]; then
- ${ECHO} " ${file} already exists, example file is"
- ${ECHO} " ${samplefile}"
+ ${ECHO} " ${file} already exists, example file is"
+ ${ECHO} " ${samplefile}"
fi
else
if [ -e "${samplefile}" ]; then
- ${ECHO} " ${file}"
+ ${ECHO} " ${file}"
${CP} "${samplefile}" "${file}"
${CHMOD} @RCD_SCRIPTS_MODE@ "${file}"
fi
@@ -352,6 +353,7 @@ EOF
${CHGRP} "${group}" "${file}"
${CHMOD} ${mode} "${file}"
done
+ echo ""
if ! msgempty; then
${ECHO} "==========================================================================="
msgprint