From e18148be2592352700b8d0f7dc93ddd45d117c81 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 25 Feb 2013 23:05:51 -0800 Subject: [PATCH] Fix testing of /opt/local, move /usr/local to the front of the list, and break on first found. Check for Sparkle on Darwin --- scripts/check-dependencies.sh | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 6a3e6377..9393b4d7 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -418,12 +418,14 @@ find_installed_version() depname=$1 # try to find/parse headers and/or binary output + # break on the first match. (change the order to change precedence) if [ ! $fsv_tmp ]; then - for syspath in "/opt" "/usr/pkg" "/usr" "/usr/local" $OPENSCAD_LIBRARIES; do + for syspath in "/usr/local" "/opt/local" "/usr/pkg" "/usr" $OPENSCAD_LIBRARIES; do if [ -e $syspath ]; then debug $depname"_sysver" $syspath eval $depname"_sysver" $syspath fsv_tmp=`eval echo "$"$depname"_sysver_result"` + if [ $fsv_tmp ]; then break; fi fi done fi @@ -471,6 +473,24 @@ check_misc() if [ "`uname -a|grep -i netbsd`" ]; then echo "NetBSD: Please manually verify the X Sets have been installed" fi + + if [ "`uname -a|grep -i darwin`" ]; then + sparkle= + libs="~/Library /Library" + for libhome in $libs; do + echo "$libhome/Frameworks/Sparkle.framework..." + if [ -d $libhome/Frameworks/Sparkle.framework ]; then + echo "Found in $libhome" + sparkle=$libhome + break + fi + done + if [ -n "$sparkle" ]; then + echo "OS X: Make sure Sparkle.framework is installed in your Frameworks path" + else + echo "OS X: Sparkle.framework found in $libhome" + fi + fi } checkargs()