From 9c43faae0522f74192bb38e052a601a18033cb4c Mon Sep 17 00:00:00 2001
From: OttoLidenbrock <unknown>
Date: Sun, 10 May 2015 19:23:35 +1000
Subject: [PATCH] Fix bug with Zip file creation and extraction

---
 build/android/Makefile                                     | 4 ++--
 build/android/src/com/MoNTE48/MultiCraft/MainActivity.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 616fdcfc6..498ce5ff6 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -664,9 +664,9 @@ assets : $(ASSETS_TIMESTAMP)
 	ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \
 	find MultiCraft >"filelist.txt";                                             \
 	cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old;            \
-	pushd ${ROOT}/assets/;		\
+	pushd ${ROOT}/assets/MultiCraft;		\
 	echo "Creating Files.zip";	\
-	zip -r -X -q Files.zip MultiCraft/*;	           \
+	zip -r -X -q ../Files.zip *;	           \
 	popd;							\
 	else                                                                       \
 		echo "nothing to be done for assets";                                  \
diff --git a/build/android/src/com/MoNTE48/MultiCraft/MainActivity.java b/build/android/src/com/MoNTE48/MultiCraft/MainActivity.java
index 1006aa286..50b231c06 100644
--- a/build/android/src/com/MoNTE48/MultiCraft/MainActivity.java
+++ b/build/android/src/com/MoNTE48/MultiCraft/MainActivity.java
@@ -35,7 +35,7 @@ public class MainActivity extends Activity implements IUtilitiesCallback {
 	private ProgressDialog mProgressDialog;
 	private TextView mProgressTextView;
 	private String unzipLocation = Environment.getExternalStorageDirectory()
-			+ "/Minetest/";
+			+ "/MultiCraft/";
 	private File version;
 	private Utilities util;
 	private ProgressBar mProgressBar;
@@ -316,4 +316,4 @@ public class MainActivity extends Activity implements IUtilitiesCallback {
 		unregisterReceiver(myBroadcastReceiver_Update);
 		super.onDestroy();
 	}
-}
\ No newline at end of file
+}