Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9942/10.4/unstable/main/finkinfo/x11
Modified Files:
applex11tools.info
Log Message:
updated to find the intel installer
Index: applex11tools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/applex11tools.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- applex11tools.info 17 Nov 2006 17:00:31 -0000 1.3
+++ applex11tools.info 19 Nov 2006 21:09:49 -0000 1.4
@@ -29,10 +29,19 @@
#!/bin/sh -e
install -d -m 755 "%d"
+ PKG_PATH=""
echo -e "- searching for the X11 installer: \c"
- PKG_PATH="/Volumes/Mac OS X Install
DVD/System/Installation/Packages/X11User.pkg"
- if [ ! -d "$PKG_PATH" ]; then
+
+ # first, check known paths
+ for PACKAGE in "/Volumes/Mac OS X Install
DVD/System/Installation/Packages/X11User.pkg" \
+ "/Volumes/Mac OS X Install Disc
1/System/Installation/Packages/X11User.pkg"; do
+ if [ -d "$PACKAGE" ]; then
+ PKG_PATH="$PACKAGE"
+ fi
+ done
+
+ if [ -z "$PKG_PATH" ]; then
# try finding it somewhere else
find /Volumes -type d -name X11User.pkg | grep -v Receipts |
while read PACKAGE; do
if [ -f "$PACKAGE/Contents/Archive.pax.gz" ]; then
@@ -42,7 +51,7 @@
done
fi
- if [ ! -d "$PKG_PATH" ]; then
+ if [ -z "$PKG_PATH" ]; then
echo "$PKG_PATH does not exist, bailing"
exit 1
fi
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
