[Packaging] Minor osx updates

osx/deluge

@@ -24,6 +24,7 @@ export XDG_DATA_DIRS="$bundle_data"
 export GTK_DATA_PREFIX="$bundle_res"
 export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
+
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"

osx/deluge-console

@@ -11,7 +11,7 @@ fi
 tmp=`dirname "$full_path"`
 tmp=`dirname "$tmp"`
 bundle=`dirname "$tmp"`
-bundle_contents=${bundle%"/Contents"}"/Contents"
+bundle_contents="$bundle"/Contents
 bundle_macos="$bundle_contents"/MacOS
 bundle_res="$bundle_contents"/Resources
 bundle_lib="$bundle_res"/lib

osx/deluge-web

@@ -11,7 +11,7 @@ fi
 tmp=`dirname "$full_path"`
 tmp=`dirname "$tmp"`
 bundle=`dirname "$tmp"`
-bundle_contents=${bundle%"/Contents"}"/Contents"
+bundle_contents="$bundle"/Contents
 bundle_macos="$bundle_contents"/MacOS
 bundle_res="$bundle_contents"/Resources
 bundle_lib="$bundle_res"/lib

osx/deluge.bundle

@@ -25,10 +25,9 @@
   <binary>${prefix}/lib/libboost_python.dylib</binary>
   <binary>${prefix}/lib/libtorrent-rasterbar.8.dylib</binary>
   <binary>${prefix}/lib/libssl.1.0.0.dylib</binary>
+  <binary>${prefix}/lib/libz.1.2.8.dylib</binary>
 
-  <data dest="${bundle}/Contents/Resources/">
-    ${project}/../dist/deluge.app/Contents/Resources/
-  </data>
+  <data dest="${bundle}/Contents/Resources/">${project}/../dist/deluge.app/Contents/Resources/</data>
   <data>${prefix}/lib/pygtk/2.0/</data>
   <!-- gtk theme -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/libclearlooks.so</binary>

osx/deluged

@@ -11,7 +11,7 @@ fi
 tmp=`dirname "$full_path"`
 tmp=`dirname "$tmp"`
 bundle=`dirname "$tmp"`
-bundle_contents=${bundle%"/Contents"}"/Contents"
+bundle_contents="$bundle"/Contents
 bundle_macos="$bundle_contents"/MacOS
 bundle_res="$bundle_contents"/Resources
 bundle_lib="$bundle_res"/lib