Remove unnecessary copying of PCRE library files - the package template picks them...

[OSXPackageBuilder.git] / constructPkgContent.sh

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index f81a01d..904803f 100755 (executable)
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -28,70 +28,88 @@
 #                USA
 #
 # Modification : If you modify this file please consider whether your 
-#                changes ought to be passed back to the macsetup module.
+#                changes ought to be passed back to the OSXPackageBuilder
+#                module.
 #
 
-# 1. Remove existing 'pkg content' folder if found
+# Use the common script to locate the directory containing Privoxy's source ($SOURCEDIR)
+. ./common.sh
+
+# Remove existing 'pkg content' folder if found
 echo ""
 echo "Remove existing 'pkg content' folder if found"
-echo ""
 rm -rf pkg\ content
 
-# 1. Copy the package skeleton (the unchanging content) to a new folder named 'pkg content'
-echo ""
+# Copy the package skeleton (the unchanging content) to a new folder named 'pkg content'
 echo ""
 echo "Copy the package skeleton (the unchanging content) to a new folder named 'pkg content'"
 echo ""
 cp -vR pkg\ content\ skeleton pkg\ content
 
-# 2. Copy the compiled privoxy binary from the 'current' project
+# Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
-echo "Copy the compiled privoxy binary from the 'current' project"
+echo "Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory"
 echo ""
-cp -v ../current/privoxy pkg\ content/usr/local/sbin
+mkdir -vp pkg\ content/usr/local/sbin
+cp -v ../${SOURCE_DIR}/privoxy pkg\ content/usr/local/sbin
 
-# 3. Copy the configuration hierarchy from the 'current' project
+# Copy the configuration hierarchy from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
-echo "Copy the configuration hierarchy from the 'current' project"
+echo "Copy most of the configuration hierarchy from the '${SOURCE_DIR}' directory"
 echo ""
-for i in default.action default.filter match-all.action config trust user.action user.filter templates; do
+mkdir -vp pkg\ content/usr/local/etc/privoxy/vanilla
+for i in default.action default.filter match-all.action trust user.action user.filter templates; do
        if [ "$i" = "templates" ]; then
                # for the templates subfolder copy all files therein
-               cp -vR ../current/$i pkg\ content/usr/local/etc/privoxy/vanilla/$i
+               cp -vR ../${SOURCE_DIR}/$i pkg\ content/usr/local/etc/privoxy/vanilla/$i
        else
                # for all regular files just copy them across
-               cp -v ../current/$i pkg\ content/usr/local/etc/privoxy/vanilla/$i
+               cp -v ../${SOURCE_DIR}/$i pkg\ content/usr/local/etc/privoxy/vanilla/$i
        fi
 done
 
-# 4. Copy the documentation hierarchy from the 'current' project
+# Enter the correct values for confdir and logdir into the config file 
+echo ""
+echo ""
+echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir, logdir and user-manual settings in passing"
+echo ""
+sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../${SOURCE_DIR}/config > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1
+sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1 > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2
+sed 's/#user-manual http:\/\/www.privoxy.org\/user-manual\//user-manual \/usr\/local\/share\/doc\/privoxy\/user-manual\//g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2 > pkg\ content/usr/local/etc/privoxy/vanilla/config
+rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp*
+
+# Copy the documentation hierarchy from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
-echo "Copy the documentation hierarchy from the 'current' project"
+echo "Copy the documentation hierarchy from the '${SOURCE_DIR}' directory"
 echo ""
+mkdir -vp pkg\ content/usr/local/share/doc/privoxy
 # copy the required directory hierarchies
 for i in developer-manual faq images man-page team user-manual; do
-       cp -vR ../current/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
+       cp -vR ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
 done
 # copy the top-level files
 for i in announce.txt p_doc.css privoxy-index.html; do
-       cp -v ../current/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
+       cp -v ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
 done
+# copy p_doc.css down into user-manual subdir (as per the make install target)
+cp -v ../${SOURCE_DIR}/doc/webserver/p_doc.css pkg\ content/usr/local/share/doc/privoxy/user-manual/p_doc.css
 # copy the project's AUTHORS, ChangeLog, LICENSE and README files
 for i in AUTHORS ChangeLog LICENSE README; do
-       cp -v ../current/$i pkg\ content/usr/local/share/doc/privoxy/$i
+       cp -v ../${SOURCE_DIR}/$i pkg\ content/usr/local/share/doc/privoxy/$i
 done
 
-# 5. Copy the manpage from the 'current' project
+# Copy the manpage from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
-echo "Copy the manpage from the 'current' project"
+echo "Copy the manpage from the '${SOURCE_DIR}' directory"
 echo ""
-cp -v ../current/privoxy.1 pkg\ content/usr/local/share/man/man1
+mkdir -vp pkg\ content/usr/local/share/man/man1
+cp -v ../${SOURCE_DIR}/privoxy.8 pkg\ content/usr/local/share/man/man1
 
-# 6. Remove unnecessary CVS administration files
+# Remove CVS administration files
 echo ""
 echo ""
 echo "Remove CVS administration files"