[vidalia-svn] r3721: fix screwup from rpm addition. (vidalia/trunk/pkg)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2009-04-12 21:46:50 -0400 (Sun, 12 Apr 2009)
New Revision: 3721

Modified:
   vidalia/trunk/pkg/package.sh
Log:
fix screwup from rpm addition.


Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2009-04-12 18:24:39 UTC (rev 3720)
+++ vidalia/trunk/pkg/package.sh	2009-04-13 01:46:50 UTC (rev 3721)
@@ -11,18 +11,15 @@
 ##  the terms described in the LICENSE file.
 ##
 
-
 # Builds distribution packages for various platforms.
 
-
 # Check for proper script arguments
 if [ "$#" -eq 0 ]
 then
-  echo "Usage: $0 <tarball|osx|osx-bundle|rpm>"
+  echo "Usage: $0 <tarball|win32|osx|osx-bundle>"
   exit 1
 fi
 
-
 # Make the distribution depending on what type was requested
 case "$1" in
 #
@@ -48,29 +45,49 @@
 # OS X .dmg
 #
 "osx")
-  cp -R ../src/vidalia/Vidalia.app ../
+  mkdir ../LEGAL 
+  mkdir ../.background
+  cp -R ../README ../src/vidalia/Vidalia.app ../
+  cp osx/background.png ../.background/
+  cp osx/nonbundle-ds_store ../.DS_Store
+  cp ../CREDITS ../CHANGELOG ../Vidalia.app/
+  cp ../LICENSE ../LICENSE-GPLV2 ../LICENSE-GPLV3 ../LICENSE-LGPLV3 ../LICENSE-OPENSSL ../LEGAL/
+  cp -R ../LEGAL ../Vidalia.app/
   srcdir="../"
-  srcfiles="Vidalia.app README CREDITS CHANGELOG"
-  srcfiles="$srcfiles LICENSE LICENSE-GPLV2 LICENSE-GPLV3"
-  srcfiles="$srcfiles LICENSE-LGPLV3 LICENSE-OPENSSL"
+  srcfiles="Vidalia.app README LEGAL .background .DS_Store"
   osx/builddmg.sh "$srcdir" "$srcfiles"
   ;;
 
 #
-# 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-file>"
     exit 1
   fi
   torpath="$2"
-  privoxy="$3"
+  polipopath="$3"
+  torbuttonpath="$4"
+  torversion=`echo "$torpath" | sed -e "s/.*\///" | sed -e "s/tor-//"`
   
-  pushd "osx"
-  ./buildmpkg.sh "$torpath" "$privoxy"
-  popd
+  mkdir ../LEGAL
+  mkdir ../.background
+  cp -R ../README ../src/vidalia/Vidalia.app ../
+  cp osx/background.png ../.background/
+  cp osx/bundle-ds_store ../.DS_Store
+  cp osx/vidalia.conf.sample ../Vidalia.app/Contents/Resources/vidalia.conf
+  cp ../CREDITS ../CHANGELOG ../Vidalia.app/
+  cp ../LICENSE ../LICENSE-GPLV2 ../LICENSE-GPLV3 ../LICENSE-LGPLV3 ../LICENSE-OPENSSL ../LEGAL/
+  cp -R ../LEGAL ../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 ../Vidalia.app/
+  srcdir="../"
+  srcfiles="Vidalia.app README LEGAL .background .DS_Store"
+  osx/builddmg.sh "$srcdir" "$srcfiles" "bundle" "$torversion"
   ;;
   
 #
@@ -88,7 +105,6 @@
   popd
   ;;
 
-#
 # Invalid
 #
 *)
@@ -97,4 +113,3 @@
 esac
 
 exit $?
-