From 8146329cb6b04d8d4408737cd7702429ca73c841 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Tue, 23 Aug 2005 09:33:14 +0000
Subject: Avoid double // in the case where PREFIX is / (eg:
 shells/standalone-tcsh)

---
 mk/install/shell | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'mk/install')

diff --git a/mk/install/shell b/mk/install/shell
index f5b3789d835..fb295a2bdaa 100644
--- a/mk/install/shell
+++ b/mk/install/shell
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: shell,v 1.2 2005/08/19 22:24:10 jlam Exp $
+# $NetBSD: shell,v 1.3 2005/08/23 09:33:14 abs Exp $
 #
 # +SHELL - shell registration script
 #
@@ -62,7 +62,11 @@ ADD)
 		esac
 		case $shell in
 		/*)	continue ;;
-		*)	shell="${PKG_PREFIX}/$shell" ;;
+		*)	if [ ${PKG_PREFIX} = / ] ; then
+				shell="/$shell"
+			else
+				shell="${PKG_PREFIX}/$shell"
+			fi ;;
 		esac
 		${TEST} -f "$shell" || continue
 
@@ -101,7 +105,11 @@ REMOVE)
 		esac
 		case $shell in
 		/*)	continue ;;
-		*)	shell="${PKG_PREFIX}/$shell" ;;
+		*)	if [ ${PKG_PREFIX} = / ] ; then
+				shell="/$shell"
+			else
+				shell="${PKG_PREFIX}/$shell"
+			fi ;;
 		esac
 		${TEST} -f "$shell" || continue
 
@@ -135,7 +143,11 @@ CHECK-ADD)
 	{ while read shell; do
 		case $shell in
 		/*)	continue ;;
-		*)	shell="${PKG_PREFIX}/$shell" ;;
+		*)	if [ ${PKG_PREFIX} = / ] ; then
+				shell="/$shell"
+			else
+				shell="${PKG_PREFIX}/$shell"
+			fi ;;
 		esac
 		${TEST} -f "$shell" || continue
 
@@ -169,7 +181,11 @@ CHECK-REMOVE)
 	{ while read shell; do
 		case $shell in
 		/*)	continue ;;
-		*)	shell="${PKG_PREFIX}/$shell" ;;
+		*)	if [ ${PKG_PREFIX} = / ] ; then
+				shell="/$shell"
+			else
+				shell="${PKG_PREFIX}/$shell"
+			fi ;;
 		esac
 		${TEST} -f "$shell" || continue
 
-- 
cgit v1.2.3