Module Name: src
Committed By: uebayasi
Date: Sat Aug 15 09:33:56 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 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.198 src/usr.sbin/postinstall/postinstall:1.199
--- src/usr.sbin/postinstall/postinstall:1.198 Sat Jul 11 06:40:37 2015
+++ src/usr.sbin/postinstall/postinstall Sat Aug 15 09:33:55 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.198 2015/07/11 06:40:37 dholland Exp $
+# $NetBSD: postinstall,v 1.199 2015/08/15 09:33:55 uebayasi Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -231,7 +231,7 @@ check_dir()
# and with the special name "SKIP" being used to mark gaps in the
# sequence.
# Returns 0 if ok, 1 otherwise.
-#
+#
check_ids()
{
[ $# -ge 6 ] || err 3 "USAGE: checks_ids op type file start srcfile id [...]"
@@ -499,7 +499,7 @@ file_exists_exact()
[ -n "$1" ] || err 3 "USAGE: file_exists_exact path"
_path="${1#.}"
[ -h "${DEST_DIR}${_path}" ] || \
- [ -e "${DEST_DIR}${_path}" ] || return 1
+ [ -e "${DEST_DIR}${_path}" ] || return 1
while [ "${_path}" != "/" -a "${_path}" != "." ] ; do
_dirname="$(dirname "${_path}" 2>/dev/null)"
_basename="$(basename "${_path}" 2>/dev/null)"
@@ -523,9 +523,9 @@ obsolete_paths()
failed=0
while read ofile; do
- if ! file_exists_exact "${ofile}"; then
- continue
- fi
+ if ! file_exists_exact "${ofile}"; then
+ continue
+ fi
ofile="${DEST_DIR}${ofile#.}"
cmd="rm"
ftype="file"
@@ -566,7 +566,7 @@ obsolete_libs()
}
_obsolete_libs()
-{
+{
dir="$1"
(
@@ -622,7 +622,7 @@ function checklib(results, line, regex)
}
#}'
-
+
)
}
@@ -718,7 +718,7 @@ contents_owner()
find "${_dir}" \( \( ! -user "${_user}" \) -o \
\( ! -group "${_grp}" \) \) -a -print0 \
| xargs -0 chown "${_user}:${_grp}"
- fi
+ fi
}
# get_makevar var [var ...]
@@ -950,7 +950,7 @@ do_fontconfig()
# First, check for updates we can handle.
if ! $SOURCEMODE; then
- FONTCONFIG_DIR="${SRC_DIR}/etc/fonts/conf.avail"
+ FONTCONFIG_DIR="${SRC_DIR}/etc/fonts/conf.avail"
else
FONTCONFIG_DIR="${XSRC_DIR}/external/mit/fontconfig/dist/conf.d"
fi
@@ -997,7 +997,7 @@ do_fontconfig()
else
FONTS_DIR="${SRC_DIR}/external/mit/xorg/lib/fontconfig/etc"
fi
-
+
populate_dir "$op" false "${FONTS_DIR}" "${DEST_DIR}/etc/fonts" 444 \
fonts.conf
failed=$(( ${failed} + $? ))
@@ -1595,7 +1595,7 @@ do_mailerconf()
failed=$?
fi
fi
-
+
return ${failed}
}
@@ -2237,7 +2237,7 @@ Usage: ${PROGNAME} [-s srcdir] [-x xsrcd
* A directory that contains a NetBSD source tree;
* A distribution set file such as "etc.tgz" or
"xetc.tgz". Pass multiple -s options to specify
- multiple such files;
+ multiple such files;
* A temporary directory in which one or both of
"etc.tgz" and "xetc.tgz" have been extracted.
[${SRC_DIR:-/usr/src}]
@@ -2495,7 +2495,7 @@ _Fix_me_
fi
;;
-
+
*)
warn "Unknown operation '"${op}"'"
usage
