1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

Fix two bugs in scripts.

1. If update.sh failed to determine the PREFIX, it didn't realize it
had failed.  This is arguably caused by a shell bug in processing
the statement

    export PREFIX=$(expr $0 : "\(/.*\)/etc/cvsup/update\.sh\$")

This statement always succeeds even if the "expr" command fails.
Moving the "export" to a separate statement makes it work.

2. If the system had no "/home" directory, the pkg-install script
would create it with mode 0700, making ~cvsupin inaccessible to its
owner.  A user ran into this bug when installing cvsup-mirror into a
jail.
This commit is contained in:
John Polstra 2004-08-05 23:37:47 +00:00
parent e9051fdc9c
commit 7fc792b6a6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115484
3 changed files with 6 additions and 5 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= cvsup-mirror
PORTVERSION= 1.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net
DISTFILES=

View File

@ -1,10 +1,11 @@
#! /bin/sh
if ! export PREFIX=$(expr $0 : "\(/.*\)/etc/cvsup/update\.sh\$"); then
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/cvsup/update\.sh\$"); then
echo "$0: Cannot determine the PREFIX" >&2
exit 1
fi
export PREFIX
export CVSUP_ARGS="$*"
export PATH=/bin:/usr/bin:${PREFIX}/bin

View File

@ -117,10 +117,10 @@ make_account() {
if yesno \
"Would you like me to create ${u}'s home directory (${home})" y
then
(umask 77 && \
mkdir -p ${home}/.cvsup && \
touch ${home}/.cvsup/auth) || exit
mkdir -p ${home}/.cvsup || exit
touch ${home}/.cvsup/auth || exit
chown -R ${u}:${g} ${home} || exit
chmod -R go= ${home} || exit
else
echo "Please create it, and try again."
exit 1