From b846cc7133bd4f9447ac2bb5f58da5f25ba7c5e6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 29 Jul 2006 23:12:30 +0000 Subject: fixed up logic for tracking down which Wish.app to use and whether to copy it has embedded Frameworks svn path=/trunk/; revision=5432 --- scripts/find-wish.app.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/find-wish.app.sh b/scripts/find-wish.app.sh index 2e9e48f8..6ea50da9 100755 --- a/scripts/find-wish.app.sh +++ b/scripts/find-wish.app.sh @@ -4,11 +4,11 @@ cvs_root_dir=`echo $0 | sed 's|\(.*\)/.*$|\1|'`/.. cd $cvs_root_dir cvs_root_dir=`pwd` -TCLTK=`/bin/ls -1r ${cvs_root_dir}/packages/darwin_app/TclTkAquaStandalone-8.?.*.dmg|head -n 1|sed 's|.*/\(.*\)\.dmg|\1|'` +TCLTK="$1" if [ "x${TCLTK}" != "x" ]; then test -d /Volumes/${TCLTK} || \ - hdiutil mount ${cvs_root_dir}/packages/darwin_app/${TCLTK}.dmg + hdiutil mount -quiet ${cvs_root_dir}/packages/darwin_app/${TCLTK}.dmg echo "/Volumes/${TCLTK}" else if [ -d "/Library/Frameworks/Tk.framework/Resources" ]; then @@ -20,5 +20,3 @@ else fi fi -exit - -- cgit v1.2.1