From 90a3b55cb1681888b0e92f2562be812e3b8f5c8b Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 22 Aug 2007 02:19:15 +0000 Subject: When testing for the existence of the symlink before removal, use "test -h", not "test -e" which tests for the existence of the target of the symlink. Bump the PKGREVISIONs of suse100_vmware and suse91_vmware. --- emulators/suse100_vmware/INSTALL | 6 ++++-- emulators/suse100_vmware/Makefile | 4 ++-- emulators/suse91_vmware/INSTALL | 6 ++++-- emulators/suse91_vmware/Makefile | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'emulators') diff --git a/emulators/suse100_vmware/INSTALL b/emulators/suse100_vmware/INSTALL index 600d8c86d6f..c0ef7aa3968 100644 --- a/emulators/suse100_vmware/INSTALL +++ b/emulators/suse100_vmware/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.2 2007/07/30 00:01:05 jlam Exp $ +# $NetBSD: INSTALL,v 1.3 2007/08/22 02:19:15 jlam Exp $ # Generate a +ROOT_ACTIONS script that runs certain actions that require # superuser privileges. @@ -64,6 +64,8 @@ ADD,0) if ${TEST} ! -e "$dst"; then ${ECHO} "${PKGNAME}: linking $dst -> $src" ${LN} -fs "$src" "$dst" + else + ${ECHO} "${PKGNAME}: $dst already exists" fi done ;; @@ -79,7 +81,7 @@ REMOVE,0) [!/]*) dst="${PKG_PREFIX}/$dst" ;; esac - if ${TEST} -e "$dst"; then + if ${TEST} -h "$dst"; then ${ECHO} "${PKGNAME}: removing $dst" ${RM} -f "$dst" fi diff --git a/emulators/suse100_vmware/Makefile b/emulators/suse100_vmware/Makefile index 31e7ed9870a..7aa29d62549 100644 --- a/emulators/suse100_vmware/Makefile +++ b/emulators/suse100_vmware/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2007/07/29 05:19:00 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2007/08/22 02:19:15 jlam Exp $ DISTNAME= suse_vmware-${SUSE_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators DISTFILES= grep-2.5.1a-5.${SUSE_ARCH}.rpm diff --git a/emulators/suse91_vmware/INSTALL b/emulators/suse91_vmware/INSTALL index d0b88278f95..c0ef7aa3968 100644 --- a/emulators/suse91_vmware/INSTALL +++ b/emulators/suse91_vmware/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.2 2007/07/30 00:01:06 jlam Exp $ +# $NetBSD: INSTALL,v 1.3 2007/08/22 02:19:15 jlam Exp $ # Generate a +ROOT_ACTIONS script that runs certain actions that require # superuser privileges. @@ -64,6 +64,8 @@ ADD,0) if ${TEST} ! -e "$dst"; then ${ECHO} "${PKGNAME}: linking $dst -> $src" ${LN} -fs "$src" "$dst" + else + ${ECHO} "${PKGNAME}: $dst already exists" fi done ;; @@ -79,7 +81,7 @@ REMOVE,0) [!/]*) dst="${PKG_PREFIX}/$dst" ;; esac - if ${TEST} -e "$dst"; then + if ${TEST} -h "$dst"; then ${ECHO} "${PKGNAME}: removing $dst" ${RM} -f "$dst" fi diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile index f19e5fdff55..5c87e405a8f 100644 --- a/emulators/suse91_vmware/Makefile +++ b/emulators/suse91_vmware/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2007/07/29 05:19:22 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/08/22 02:19:15 jlam Exp $ DISTNAME= suse_vmware-${SUSE_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= emulators DISTFILES= grep-2.5.1-416.${SUSE_ARCH}.rpm -- cgit v1.2.3