cosmetic changes.

This commit is contained in:
Hajimu UMEMOTO 2004-03-30 15:28:07 +00:00
parent 7694957199
commit 9fc0a4b074
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=105709
12 changed files with 72 additions and 72 deletions

View File

@ -11,16 +11,16 @@ PKG_BATCH=${BATCH:=NO}
PKG_PREFIX=${PKG_PREFIX:=/usr/local}
checkfile() {
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
rm $1
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
}
# Uninstall timseived's Cyrus.conf file.
@ -49,7 +49,7 @@ modify_cyrus_user() {
fi
uhome=/nonexistent
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}

View File

@ -16,7 +16,7 @@ modify_cyrus_user() {
shell=/bin/csh
uhome=${PKG_PREFIX}/cyrus
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}
@ -31,8 +31,8 @@ checkfile() {
0) # config file exists, but is the same
;;
1) # config file exists and differs
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
;;
*) # no config file exists, copy it
install -c -m 644 $1.dist $1

View File

@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
checkfile() {
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
rm $1
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
}
#
@ -39,7 +39,7 @@ modify_cyrus_user() {
fi
uhome=/nonexistent
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}

View File

@ -18,7 +18,7 @@ modify_cyrus_user() {
shell=/bin/csh
uhome=${PKG_PREFIX}/cyrus
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}
@ -33,8 +33,8 @@ checkfile() {
0) # config file exists, but is the same
;;
1) # config file exists and differs
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
;;
*) # no config file exists, copy it
install -c -m 644 $1.dist $1

View File

@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
checkfile() {
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
rm $1
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
}
#
@ -39,7 +39,7 @@ modify_cyrus_user() {
fi
uhome=/nonexistent
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}

View File

@ -18,7 +18,7 @@ modify_cyrus_user() {
shell=/bin/csh
uhome=${PKG_PREFIX}/cyrus
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}
@ -33,8 +33,8 @@ checkfile() {
0) # config file exists, but is the same
;;
1) # config file exists and differs
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
;;
*) # no config file exists, copy it
install -c -m 644 $1.dist $1

View File

@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
checkfile() {
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
rm $1
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
}
#
@ -39,7 +39,7 @@ modify_cyrus_user() {
fi
uhome=/nonexistent
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}

View File

@ -18,7 +18,7 @@ modify_cyrus_user() {
shell=/bin/csh
uhome=${PKG_PREFIX}/cyrus
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}
@ -33,8 +33,8 @@ checkfile() {
0) # config file exists, but is the same
;;
1) # config file exists and differs
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
;;
*) # no config file exists, copy it
install -c -m 644 $1.dist $1

View File

@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
checkfile() {
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
diff -bBqw $1 $1.dist >/dev/null 2>&1
case $? in
0) # config file exists, but is the same
rm $1
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
;;
1) # config file exists and differs
;;
*) # no config file exists
;;
esac
}
#
@ -39,7 +39,7 @@ modify_cyrus_user() {
fi
uhome=/nonexistent
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}

View File

@ -18,7 +18,7 @@ modify_cyrus_user() {
shell=/bin/csh
uhome=${PKG_PREFIX}/cyrus
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
e=$?
echo "*** Failed to update user \`${USER}'."
exit ${e}
@ -33,8 +33,8 @@ checkfile() {
0) # config file exists, but is the same
;;
1) # config file exists and differs
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
echo "** Make sure $1 is in sync with this version";
echo " of the port. See $1.dist for details.";
;;
*) # no config file exists, copy it
install -c -m 644 $1.dist $1

View File

@ -19,7 +19,7 @@ CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
delete_sasldb() {
if [ -f ${SASLDB_NAME} ] ; then
if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ]; then
rm ${SASLDB_NAME}
else
echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file"

View File

@ -23,13 +23,13 @@ CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
create_user() {
USER=${CYRUS_USER}
GROUP=${CYRUS_GROUP}
PW=/usr/sbin/pw
PW=/usr/sbin/pw
if [ -x /sbin/nologin ]; then
shell=/sbin/nologin
else
shell=/nonexistent
fi
if [ -x /sbin/nologin ]; then
shell=/sbin/nologin
else
shell=/nonexistent
fi
uhome="/nonexistent"
if ! ${PW} show group ${GROUP} -q >/dev/null; then