ViewClient: Prevents wrong interpretation of spaces in path

dtmilano · dtmilano · commit 090610531a3a · 2013-05-04T01:43:08.000-04:00
- Added install to Google Drive target
diff --git a/AndroidViewClient/build.xml b/AndroidViewClient/build.xml
@@ -17,9 +17,10 @@
 		</filterchain>
 	</loadfile>
 
+	<property name="avc.jar" value="bin/${avc.jarname}-${avc.version}.jar" />
 	<target name="jar" depends="compile">
 		<echo message="Creating ${avc.jarname} ${avc.version} jar ..." />
-		<jar destfile="bin/${avc.jarname}-${avc.version}.jar">
+		<jar destfile="${avc.jar}">
 			<fileset dir="src/" excludes="**/*.java" />
 			<fileset dir="." includes="tools/*" />
 			<fileset dir="bin/classes" />
@@ -39,4 +40,8 @@
 		<javac srcdir="src" destdir="bin/classes" />
 	</target>
 
+    <target name="install" depends="jar">
+        <mkdir dir="${gdrive.dest.dir}" />
+        <copy file="${avc.jar}" todir="${gdrive.dest.dir}" />
+    </target>
 </project>
diff --git a/AndroidViewClient/project.properties b/AndroidViewClient/project.properties
@@ -1,2 +1,4 @@
 # Culebra
 avc.jarname=androidviewclient
+gdrive.dest.dir=${user.home}/Google Drive//Android/AndroidViewClient/bin/
+
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient/ViewClient.java b/AndroidViewClient/src/com/dtmilano/android/viewclient/ViewClient.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 import java.util.jar.JarEntry;
@@ -128,24 +129,26 @@ public ViewClient(Command cmd, String[] args) throws IOException {
         if (args != null && args.length > 0) {
             mArgs = args;
         }
-        final File file = new File(ViewClient.class.getProtectionDomain().getCodeSource()
-                .getLocation().getPath());
+        final File file = new File(URLDecoder.decode(ViewClient.class.getProtectionDomain()
+                .getCodeSource()
+                .getLocation().getPath(), "UTF-8"));
         if (DEBUG) {
-            System.err.println("jar=" + file);
+            System.err.println("jar=" + file.getCanonicalPath() + "    exists? " + file.exists());
         }
 
         try {
             mJar = new JarFile(file);
         } catch (ZipException e) {
-            error("Tools should be started using the jar file.");
+            error("Tools should be started using the jar file.", e);
             usage();
         }
 
         final String entry = TOOLS + "/" + cmd.name().toLowerCase();
         final JarEntry jarEntry = mJar.getJarEntry(entry);
         if (jarEntry != null) {
             final InputStream is = mJar.getInputStream(jarEntry);
-            // We cannot use /tmp or similar because sometimes it's mounted noexec
+            // We cannot use /tmp or similar because sometimes it's mounted
+            // noexec
             mDest = new File(System.getProperty("user.home") + File.separator
                     + cmd.name().toLowerCase());
             final FileOutputStream fos = new java.io.FileOutputStream(mDest);
@@ -279,6 +282,11 @@ private static void error(String msg) {
         System.err.println(msg);
     }
 
+    private void error(String msg, Exception e) {
+        error(msg);
+        e.printStackTrace(System.err);
+    }
+
     private static void fatal(String msg) {
         error(msg);
         System.exit(1);
