[vidalia-svn] r3086: Scrap the installer, dragging is what the cool kids do. (vidalia/trunk/pkg)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-09-13 20:56:55 -0400 (Sat, 13 Sep 2008)
New Revision: 3086

Modified:
   vidalia/trunk/pkg/package.sh
Log:
Scrap the installer, dragging is what the cool kids do.


Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2008-09-14 00:55:28 UTC (rev 3085)
+++ vidalia/trunk/pkg/package.sh	2008-09-14 00:56:55 UTC (rev 3086)
@@ -57,20 +57,29 @@
   ;;
 
 #
-# OS X .mpkg (Bundle)
+# OS X (Bundle)
 #
 "osx-bundle")
-  if [ $# -ne 3 ]
+  if [ $# -ne 4 ]
   then
-    echo "Usage: $0 osx-bundle <path-to-tor> <privoxy-pkg.zip>"
+    echo "Usage: $0 osx-bundle <path-to-tor> <path-to-polipo> <path-to-torbutton>"
     exit 1
   fi
   torpath="$2"
-  privoxy="$3"
+  polipopath="$3"
+  torbuttonpath="$4"
   
-  pushd "osx"
-  ./buildmpkg.sh "$torpath" "$privoxy"
-  popd
+  cp -R ../src/vidalia/Vidalia.app ../
+  cp ../README ../CREDITS ../CHANGELOG ../LICENSE ../LICENSE-GPLV2 ../LICENSE-GPLV3 ../Vidalia.app/
+  cp ../LICENSE-LGPLV3 ../LICENSE-OPENSSL ../Vidalia.app/
+  cp $torpath/src/or/tor $torpath/src/tools/tor-checkkey $torpath/src/tools/tor-gencert $torpath/src/tools/tor-resolve ../Vidalia.app/
+  cp $torpath/src/config/geoip $torpath/src/config/torrc.sample ../Vidalia.app/
+  cp $polipopath/polipo $polipopath/contrib/tor-polipo.conf ../Vidalia.app/
+  cp $torbuttonpath/torbutton-1.2.0-fx.xpi ../Vidalia.app/
+  srcdir="../"
+  srcfiles="Vidalia.app"
+  osx/builddmg.sh "$srcdir" "$srcfiles"
+
   ;;
   
 #