Release 1.5.6

meefik · meefik · commit 844a69283127 · 2016-02-16T19:38:54.000+03:00
Former-commit-id: 398a52b
diff --git 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="ru.meefik.linuxdeploy"
-    android:versionCode="190"
-    android:versionName="1.5.5" >
+    android:versionCode="191"
+    android:versionName="1.5.6" >
 
     <uses-sdk
         android:minSdkVersion="7"
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,13 @@
 Changelog (English)
 ===================
 
+1.5.6
+Fixed apt resolve in stretch and xenial
+Added support kali-rolling in Kali Linux
+Added target type "Auto" for manual prepare target path
+Added timestamp support to log filename (${TIMESTAMP} variable)
+End of support Debian Squeeze and Kali Moto
+
 1.5.5
 Open a shell from Android Terminal Emulator
 Added support CentOS
@@ -323,6 +330,13 @@ Updated list packages of base system installation
 История изменений (Русский)
 ===========================
 
+1.5.6
+Исправлена проблема c apt в stretch и xenial
+Добавлена ветка kali-rolling в Kali Linux
+Добавлен тип установки "Автоопределение" для ручной настройки места установки
+В логфайл добавлена временная метка (переменная ${TIMESTAMP})
+Закончена поддержка Debian Squeeze и Kali Moto
+
 1.5.5
 Открытие командной оболочки в Android Terminal Emulator
 Добавлена поддержка CentOS
diff --git a/assets/all/share/cli.sh b/assets/all/share/cli.sh
@@ -874,6 +874,8 @@ configure_part()
                     ;;
                     esac
                 fi
+                # fix resolv problem for stretch and xenial
+                echo 'Debug::NoDropPrivs true;' > "${CHROOT_DIR}/etc/apt/apt.conf.d/00no-drop-privs"
             ;;
             archlinux)
                 if [ "${platform}" = "intel" ]
diff --git a/assets/all/share/debootstrap/scripts/kali-rolling b/assets/all/share/debootstrap/scripts/kali-rolling
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partition</item>
         <item>Verzeichnis</item>
         <item>RAM</item>
+        <item>Auto</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partición</item>
         <item>Directorio</item>
         <item>RAM</item>
+        <item>Auto</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partition</item>
         <item>Répertoire</item>
         <item>RAM</item>
+        <item>Automatique</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Automatique</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partizione</item>
         <item>Direttorio</item>
         <item>RAM</item>
+        <item>Auto</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partition</item>
         <item>Directory</item>
         <item>RAM</item>
+        <item>Auto</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partycja</item>
         <item>Katalog</item>
         <item>RAM</item>
+        <item>Automatyczny</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Automatyczny</item>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
@@ -10,6 +10,7 @@
         <item>Partição</item>
         <item>Diretório</item>
         <item>RAM</item>
+        <item>Automático</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Automático</item>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
@@ -10,6 +10,7 @@
         <item>Раздел</item>
         <item>Директория</item>
         <item>Оперативная память</item>
+        <item>Автоопределение</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Автоопределение</item>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
@@ -10,6 +10,7 @@
         <item>Na oddiel</item>
         <item>Adresár</item>
         <item>Do pamäte RAM</item>
+        <item>Automatický</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Automatický</item>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
@@ -10,6 +10,7 @@
         <item>Phân vùng</item>
         <item>Thư mục</item>
         <item>RAM</item>
+        <item>Tự động</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Tự động</item>
diff --git a/res/values-zh/arrays.xml b/res/values-zh/arrays.xml
@@ -10,6 +10,7 @@
         <item>分区</item>
         <item>目录</item>
         <item>RAM</item>
+        <item>自动</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>自动</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -42,12 +42,14 @@
         <item>partition</item>
         <item>directory</item>
         <item>ram</item>
+        <item>auto</item>
     </string-array>
     <string-array name="deploytype_entries">
         <item>File</item>
         <item>Partition</item>
         <item>Directory</item>
         <item>RAM</item>
+        <item>Auto</item>
     </string-array>
     <string-array name="fstype_values" translatable="false">
         <item>auto</item>
@@ -286,7 +288,6 @@
         <item>stable</item>
         <item>testing</item>
         <item>unstable</item>
-        <item>squeeze</item>
         <item>wheezy</item>
         <item>jessie</item>
         <item>stretch</item>
@@ -345,8 +346,8 @@
     <!-- Kali Linux -->
 
     <string-array name="kalilinux_suite_values" translatable="false">
-        <item>moto</item>
         <item>sana</item>
+        <item>kali-rolling</item>
     </string-array>
     <string-array name="kalilinux_architecture_values" translatable="false">
         <item>armel</item>
diff --git a/res/values/preferences.xml b/res/values/preferences.xml
@@ -17,7 +17,7 @@
     <string name="debug" translatable="false">false</string>
     <string name="trace" translatable="false">false</string>
     <string name="logger" translatable="false">false</string>
-    <string name="logfile" translatable="false">${EXTERNAL_STORAGE}/linuxdeploy.log</string>
+    <string name="logfile" translatable="false">${EXTERNAL_STORAGE}/linuxdeploy_${TIMESTAMP}.log</string>
     <string name="distribution" translatable="false">debian</string>
     <string name="suite" translatable="false">@string/debian_suite</string>
     <string name="architecture" translatable="false"></string>
diff --git a/src/ru/meefik/linuxdeploy/ExecScript.java b/src/ru/meefik/linuxdeploy/ExecScript.java
@@ -10,6 +10,7 @@ public class ExecScript extends Thread {
     public ExecScript(Context c, String arg) {
         this.c = c;
         this.arg = arg;
+        Logger.setLogFile(c);
     }
 
     @Override
diff --git a/src/ru/meefik/linuxdeploy/Logger.java b/src/ru/meefik/linuxdeploy/Logger.java
@@ -1,7 +1,5 @@
 package ru.meefik.linuxdeploy;
 
-import android.content.Context;
-
 import java.io.BufferedReader;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -13,11 +11,14 @@
 import java.util.List;
 import java.util.Locale;
 
+import android.content.Context;
+
 public class Logger {
 
     private static volatile List<String> protocol = new ArrayList<>();
     private static boolean fragment = false;
-
+    private static String logFile;
+    
     /**
      * Generate timestamp
      * 
@@ -78,8 +79,9 @@ private static synchronized void appendMessage(final Context c,
     private static void saveToFile(Context c, String msg) {
         byte[] data = msg.getBytes();
         FileOutputStream fos = null;
+        if (logFile == null) logFile = PrefStore.getLogFile(c);
         try {
-            fos = new FileOutputStream(PrefStore.getLogFile(c), true);
+            fos = new FileOutputStream(logFile, true);
             fos.write(data);
             fos.flush();
         } catch (Exception e) {
@@ -94,6 +96,16 @@ private static void saveToFile(Context c, String msg) {
             }
         }
     }
+    
+    /**
+     * Set log filename
+     * 
+     * @param c context
+     */
+    public static void setLogFile(Context c) {
+        long timestamp = System.currentTimeMillis() / 1000;
+        logFile = PrefStore.getLogFile(c).replace("${TIMESTAMP}", String.valueOf(timestamp));
+    }
 
     /**
      * Clear protocol
diff --git a/src/ru/meefik/linuxdeploy/PrefStore.java b/src/ru/meefik/linuxdeploy/PrefStore.java
@@ -97,7 +97,7 @@ public static String getStorage() {
     public static String getEnvDir(Context c) {
         return c.getFilesDir().getAbsolutePath();
     }
-
+    
     /**
      * Get language code
      * 
diff --git a/src/ru/meefik/linuxdeploy/PropertiesActivity.java b/src/ru/meefik/linuxdeploy/PropertiesActivity.java
@@ -407,10 +407,14 @@ private void setSummary(Preference pref, boolean init) {
 					disksize.setEnabled(true);
 					fstype.setEnabled(false);
 					break;
+				case "directory":
+                    if (init) {
+                        diskimage.setText(PrefStore.getValues(this, R.string.targetpath_directory));
+                    }
+                    disksize.setEnabled(false);
+                    fstype.setEnabled(false);
+				    break;
 				default:
-					if (init) {
-						diskimage.setText(PrefStore.getValues(this, R.string.targetpath_directory));
-					}
 					disksize.setEnabled(false);
 					fstype.setEnabled(false);
 				}
