X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=constructPkgContent.sh;h=904803f55c7c37d875ae9fcbcfa623808ef08354;hb=HEAD;hp=fb5576a67819e8a65b65821e9ff0587b946d56d2;hpb=29beb00a50eac776824da88de003336d9ef751a7;p=OSXPackageBuilder.git
diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index fb5576a..904803f 100755
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -46,18 +46,12 @@ echo "Copy the package skeleton (the unchanging content) to a new folder named '
echo ""
cp -vR pkg\ content\ skeleton pkg\ content
-# Replace the version number placeholders in the uninstallation script
-echo ""
-echo "Replace the version number placeholders in the uninstallation script"
-echo ""
-VERSION=`perl findversion.pl ../${SOURCE_DIR}/ChangeLog`
-sed "s/PRIVOXY_VERSION/${VERSION}/g" pkg\ content\ skeleton/Applications/Privoxy/uninstall.command > pkg\ content/Applications/Privoxy/uninstall.command
-
# Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory
echo ""
echo ""
echo "Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory"
echo ""
+mkdir -vp pkg\ content/usr/local/sbin
cp -v ../${SOURCE_DIR}/privoxy pkg\ content/usr/local/sbin
# Copy the configuration hierarchy from the '${SOURCE_DIR}' directory
@@ -65,6 +59,7 @@ echo ""
echo ""
echo "Copy most of the configuration hierarchy from the '${SOURCE_DIR}' directory"
echo ""
+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
@@ -78,17 +73,19 @@ done
# 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 and logdir in passing"
+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_temp
-sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp > pkg\ content/usr/local/etc/privoxy/vanilla/config
-rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp
+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 '${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 ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
@@ -97,6 +94,8 @@ done
for i in announce.txt p_doc.css privoxy-index.html; do
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 ../${SOURCE_DIR}/$i pkg\ content/usr/local/share/doc/privoxy/$i
@@ -107,19 +106,8 @@ echo ""
echo ""
echo "Copy the manpage from the '${SOURCE_DIR}' directory"
echo ""
-cp -v ../${SOURCE_DIR}/privoxy.1 pkg\ content/usr/local/share/man/man1
-
-# Optionally copy the PCRE libraries
-if [ "$1" == "-pcre" ]; then
- echo ""
- echo ""
- echo "Copy the external PCRE libraries"
- echo ""
- mkdir pkg\ content/usr/local/lib
- cp -v /usr/local/lib/libpcre* pkg\ content/usr/local/lib
- mkdir pkg\ content/usr/local/lib/pkgconfig
- cp -v /usr/local/lib/pkgconfig/libpcre* pkg\ content/usr/local/lib/pkgconfig
-fi
+mkdir -vp pkg\ content/usr/local/share/man/man1
+cp -v ../${SOURCE_DIR}/privoxy.8 pkg\ content/usr/local/share/man/man1
# Remove CVS administration files
echo ""
@@ -128,4 +116,3 @@ echo "Remove CVS administration files"
echo ""
find pkg\ content -name CVS.sandboxinfo -exec rm -rf {} \;
find pkg\ content -name CVS -exec rm -rf {} \;
-