bin/calabash-android-build.rb in calabash-android-0.3.0.pre7 vs bin/calabash-android-build.rb in calabash-android-0.3.0.pre8

@@ -12,20 +12,20 @@
 
       unless system  %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
         raise "Could not replace package name in manifest"
       end
 
-      unless system("#{ENV["ANDROID_HOME"]}/platform-tools/aapt package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
+      unless system("\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt\" package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
         raise "Could not create dummy.apk"
       end
 
       Zip::ZipFile.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
       Zip::ZipFile.open("TestServer.apk") do |zip_file|
         zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")  
       end
     end
     if is_windows?
-      jarsigner_path = "#{ENV["JAVA_HOME"]}/bin/jarsigner.exe"
+      jarsigner_path = "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
     else
       jarsigner_path = "jarsigner"
     end
 
     cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{test_server_file_name} -storepass #{keystore["keystore_password"]} -keystore \"#{File.expand_path keystore["keystore_location"]}\" #{workspace_dir}/TestServer.apk #{keystore["keystore_alias"]}"           
\ No newline at end of file