An external PCRE library set can now be optionally compiled against and bundled with...

[OSXPackageBuilder.git] / common.sh

diff --git a/common.sh b/common.sh
index 320ac17..41385ea 100755 (executable)
--- a/common.sh
+++ b/common.sh
@@ -124,8 +124,8 @@ darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
 # check the release number
 #
 case "${darwin_major_rel_num}" in
-  # Mac OS X 10.7, 10.6, 10.5
-  11|10|9)
+  # Mac OS X 10.5 or higher
+  9|1*)
     GNAME="`/usr/bin/dscl /Local/Default -list /groups | /usr/bin/grep -E '^(_)?privoxy?'`"
     UNAME="`/usr/bin/dscl /Local/Default -list /users | /usr/bin/grep -E '^(_)?privoxy?'`"
     SCRIPT="privoxy-create-dscl.sh"
@@ -147,3 +147,31 @@ case "${darwin_major_rel_num}" in
     ;;
 esac
 
+#
+# identify the directory containing Privoxy's source
+#
+cd ..
+DIRS_FOUND=0
+SOURCE_DIR=""
+if [ -d dist ]; then
+       DIRS_FOUND=1
+fi
+if [ -d current ]; then
+       DIRS_FOUND=$(( DIRS_FOUND + 10 ))
+fi
+case "${DIRS_FOUND}" in
+       # only 'current' found
+       10)
+               SOURCE_DIR="current"
+       ;;
+       # only 'dist' found
+       1)
+               SOURCE_DIR="dist"
+       ;;
+       # either both or neither found
+       11|0)
+               read -p 'Could not select the Privoxy source directory. Please supply the directory name: ' SOURCE_DIR
+       ;;
+esac
+cd OSXPackageBuilder
+echo "Using ../${SOURCE_DIR} as location of Privoxy source"
\ No newline at end of file