sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix install when people use a different /bin/sh

Browse source 
This shouldn't have been fixed, but I don't like setting UID and GID
  variables.
  so ${*} -> ${WWW*}

PR:		64032
Noticed by:	Patrick Schoenfeld <schoenfeld@in-medias-res.com>
This commit is contained in:
Clement Laforet 2004-04-07 14:27:47 +00:00
parent 2b96635340
commit c7cb8394d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=106411
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
www/apache2/pkg-install
View file

@ -1,33 +1,33 @@
#!/bin/sh #!/bin/sh
# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-install,v 1.3 2001-10-29 20:05:37 ache Exp $ # $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-install,v 1.4 2004-04-07 14:27:47 clement Exp $
# #
if [ "$2" != "PRE-INSTALL" ]; then if [ "$2" != "PRE-INSTALL" ]; then
exit 0 exit 0
fi fi
USER=www WWWUSER=www
GROUP=${USER} WWWGROUP=${WWWUSER}
UID=80 WWWUID=80
GID=${UID} WWWGID=${WWWUID}
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then if ! pw groupshow "${WWWGROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then if pw groupadd ${WWWGROUP} -g ${WWWGID}; then
echo "Added group \"${GROUP}\"." echo "Added group \"${WWWGROUP}\"."
else else
echo "Adding group \"${GROUP}\" failed..." echo "Adding group \"${WWWGROUP}\" failed..."
exit 1 exit 1
fi fi
fi fi
if ! pw usershow "${USER}" 2>/dev/null 1>&2; then if ! pw usershow "${WWWUSER}" 2>/dev/null 1>&2; then
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ if pw useradd ${WWWUSER} -u ${WWWUID} -g ${WWWGROUP} -h - \
-s "/sbin/nologin" -d "/nonexistent" \ -s "/sbin/nologin" -d "/nonexistent" \
-c "World Wide Web Owner"; \ -c "World Wide Web Owner"; \
then then
echo "Added user \"${USER}\"." echo "Added user \"${WWWUSER}\"."
else else
echo "Adding user \"${USER}\" failed..." echo "Adding user \"${WWWUSER}\" failed..."
exit 1 exit 1
fi fi
fi fi

24
www/apache20/pkg-install
View file

@ -6,28 +6,28 @@ if [ "$2" != "PRE-INSTALL" ]; then
exit 0 exit 0
fi fi
USER=www WWWUSER=www
GROUP=${USER} WWWGROUP=${WWWUSER}
UID=80 WWWUID=80
GID=${UID} WWWGID=${WWWUID}
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then if ! pw groupshow "${WWWGROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then if pw groupadd ${WWWGROUP} -g ${WWWGID}; then
echo "Added group \"${GROUP}\"." echo "Added group \"${WWWGROUP}\"."
else else
echo "Adding group \"${GROUP}\" failed..." echo "Adding group \"${WWWGROUP}\" failed..."
exit 1 exit 1
fi fi
fi fi
if ! pw usershow "${USER}" 2>/dev/null 1>&2; then if ! pw usershow "${WWWUSER}" 2>/dev/null 1>&2; then
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ if pw useradd ${WWWUSER} -u ${WWWUID} -g ${WWWGROUP} -h - \
-s "/sbin/nologin" -d "/nonexistent" \ -s "/sbin/nologin" -d "/nonexistent" \
-c "World Wide Web Owner"; \ -c "World Wide Web Owner"; \
then then
echo "Added user \"${USER}\"." echo "Added user \"${WWWUSER}\"."
else else
echo "Adding user \"${USER}\" failed..." echo "Adding user \"${WWWUSER}\" failed..."
exit 1 exit 1
fi fi
fi fi