From 4d660551a2234339e31dfeb959dd191d53f472b8 Mon Sep 17 00:00:00 2001
From: julianwi <julian.winkler1@web.de>
Date: Mon, 14 Apr 2014 17:03:55 +0200
Subject: [PATCH] version 0.2 and full arm support

---
 AndroidManifest.xml                     | 4 ++--
 README.md                               | 2 +-
 src/julianwi/javainstaller/Install.java | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d4eddc3..a139e79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="julianwi.javainstaller"
-    android:versionCode="1"
-    android:versionName="0.1" >
+    android:versionCode="2"
+    android:versionName="0.2" >
 
     <uses-sdk
         android:minSdkVersion="1"
diff --git a/README.md b/README.md
index 81a33a1..d3d902e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,6 @@
 
 Java installer is an android app to install a full Java runtime on the phone
 
-only x86 devices are supported now but I am working on an arm version.
+x86 devices and arm devices are supported.
 
 the app downloads the required files from a HTTP server unpacks them and copies them to the right directory.
\ No newline at end of file
diff --git a/src/julianwi/javainstaller/Install.java b/src/julianwi/javainstaller/Install.java
index 799e25b..9774449 100644
--- a/src/julianwi/javainstaller/Install.java
+++ b/src/julianwi/javainstaller/Install.java
@@ -27,7 +27,7 @@ public class Install implements OnClickListener, Runnable, OnCancelListener{
 	private Handler handler = new Handler();
 	private URL url;
 	private String[] tmp = new String[]{"terminal.apk", "busybox", "libc.tar.gz", "java.tar.gz"};
-	public static String[] arm = new String[]{null, "http://borcteam.bplaced.net/Daten/java/arm/busybox"};
+	public static String[] arm = new String[]{null, "http://borcteam.bplaced.net/Daten/java/arm/busybox", "http://borcteam.bplaced.net/Daten/java/arm/libc.tar.gz", "http://borcteam.bplaced.net/Daten/java/arm/java.tar.gz"};
 	
 	public Install(CheckPoint check){
 		mcheck = check;
@@ -120,6 +120,7 @@ else if(mcheck.id == 2 || mcheck.id == 3){
 					writer.write("echo \"#!/system/bin/sh\" > "+mcheck.getPath()+"/java\n"
 							   + "echo \"export LD_LIBRARY_PATH="+mcheck.getPath()+"/lib:"+MainActivity.checks[2].getPath()+"\" >> "+mcheck.getPath()+"/java\n"
 							   + "echo \""+mcheck.getPath()+"/jamvm -Xbootclasspath:"+mcheck.getPath()+"/lib/classes.zip:"+mcheck.getPath()+"/lib/glibj.zip \\$@\" >> "+mcheck.getPath()+"/java\n");
+					writer.write("$bbdir chmod 0755 "+mcheck.getPath()+"/java\n");
 					writer.write("$bbdir chmod 0755 "+mcheck.getPath()+"/lib/*\n");
 				}
 				writer.write("echo installation complete\n");
@@ -169,7 +170,7 @@ public static String getArch() {
         // Returns the value of uname -m
         String machine = System.getProperty("os.arch");
         // Convert machine name to arch identifier
-        if (machine.matches("armv[0-9]+(tej?)?l")) {
+        if (machine.matches("armv[0-9]+(tej?)?l") || machine.equals("OS_ARCH")) {
             return "arm";
         } else {
         	return "x86";