cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- rearrange

Browse Source 
- pass in PKGNAME so the errors and icons notice/install messages do not
have some unexpected spaces
This commit is contained in:
brad 2002-02-21 21:03:52 +00:00
parent 7fa9004bbf
commit 2a4d9f706b
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
www/squid/pkg/INSTALL
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.12 2002/02/20 20:31:27 brad Exp $
# $OpenBSD: INSTALL,v 1.13 2002/02/21 21:03:52 brad Exp $
#
# Pre/post-installation setup of Squid
@ -11,14 +11,6 @@ SQUIDDIR=${SQUIDDIR}
SQUIDUSER=squid
SQUIDGROUP=squid
do_squiddir_install()
{
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 775 $SQUIDDIR/logs
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR/cache
ln -sf $SQUIDDIR/logs/squid.pid /var/run/squid.pid
}
do_usergroup_install()
{
# Create Squid user and group
@ -38,6 +30,14 @@ do_usergroup_install()
fi
}
do_squiddir_install()
{
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 775 $SQUIDDIR/logs
install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR/cache
ln -sf $SQUIDDIR/logs/squid.pid /var/run/squid.pid
}
do_notice_conf()
{
echo
@ -48,17 +48,6 @@ do_notice_conf()
echo "| files as needed."
}
do_notice_errors_and_icons()
{
echo "|"
echo "| The existing errors and icons in $PREFIX/share/squid have NOT"
echo "| been changed. You may want to compare them to the current samples"
echo "| in $SAMPLE_CONFIG_DIR/errors and"
echo "| $SAMPLE_CONFIG_DIR/icons, and update them as needed."
echo "+---------------"
echo
}
do_install_conf()
{
install -d -o root -g wheel -m 755 $CONFIG_DIR
@ -71,6 +60,17 @@ do_install_conf()
echo "| Please view these files and change the configuration to meet your needs."
}
do_notice_errors_and_icons()
{
echo "|"
echo "| The existing $1 errors and icons in $PREFIX/share/squid"
echo "| have NOT been changed. You may want to compare them to the"
echo "| current samples in $SAMPLE_CONFIG_DIR/errors"
echo "| and $SAMPLE_CONFIG_DIR/icons, and update them as needed."
echo "+---------------"
echo
}
do_install_errors_and_icons()
{
install -d -o root -g wheel -m 755 $PREFIX/share/squid/icons
@ -109,11 +109,11 @@ case $2 in
do_notice_conf $1
fi
if [ ! -d $PREFIX/share/squid/errors ]; then
do_install_errors_and_icons
do_install_errors_and_icons $1
elif [ ! -f $PREFIX/share/squid/errors/English/ERR_TOO_BIG ]; then
do_install_errors_and_icons
do_install_errors_and_icons $1
else
do_notice_errors_and_icons
do_notice_errors_and_icons $1
fi
;;
*)