# changes ought to be passed back to the macsetup module.
#
+# 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 ""
echo "Replace the version number placeholders in the uninstallation script"
echo ""
-VERSION=`perl findversion.pl ../current/ChangeLog`
+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 '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
+cp -v ../${SOURCE_DIR}/privoxy pkg\ content/usr/local/sbin
-# Copy the configuration hierarchy from the 'current' project
+# Copy the configuration hierarchy from the '${SOURCE_DIR}' directory
echo ""
echo ""
-echo "Copy most of 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 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
# Enter the correct values for confdir and logdir into the config file
echo ""
echo ""
-echo "Copy the config file from the 'current' project, modifying the confdir and logdir in passing"
+echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir and logdir in passing"
echo ""
-sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../current/config > 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_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
-# Copy the documentation hierarchy from the 'current' project
+# 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 ""
# 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 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
-# 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
+cp -v ../${SOURCE_DIR}/privoxy.1 pkg\ content/usr/local/share/man/man1
# Remove CVS administration files
echo ""