Code refactoring, added new features

Former-commit-id: fe4e8d6

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="174"
-    android:versionName="1.5.3" >
+    android:versionCode="175"
+    android:versionName="1.5.4" >
 
     <uses-sdk
         android:minSdkVersion="7"
@@ -18,7 +18,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/BlackTheme" >
+        android:theme="@style/DarkTheme" >
         <activity
             android:name=".MainActivity"
             android:label="@string/title_activity_main"
@@ -48,10 +48,12 @@
         </activity>
         <activity
             android:name=".ScriptsActivity"
+            android:icon="@drawable/ic_launcher_properties"
             android:label="@string/title_activity_scripts" >
         </activity>
         <activity
             android:name=".MountsActivity"
+            android:icon="@drawable/ic_launcher_properties"
             android:label="@string/title_activity_mounts" >
         </activity>
         <activity android:name=".FullscreenActivity" >

CHANGELOG

@@ -1,6 +1,11 @@
 Changelog (English)
 ===================
 
+1.5.4
+Fixed a problem with user password that contains uppercase letters
+Added support system BusyBox, a built-in is no longer supported
+Added option to display a time stamp
+
 1.5.3
 Added an option to change the chroot directory
 Added unchroot script
@@ -311,6 +316,11 @@ Updated list packages of base system installation
 История изменений (Русский)
 ===========================
 
+1.5.4
+Исправлена проблема с установкой пароля, содержащего заглавные буквы
+Добавлена поддержка системного BusyBox, встроенный больше не поддерживается
+Добавлена опция отображения отметки времени
+
 1.5.3
 Добавлена опция изменения chroot директории
 Добавлен скрипт unchroot

assets/all/bin/linuxdeploy

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Linux Deploy
+# (C) 2012-2015 Anton Skshidlevsky <[email protected]>, GPLv3
+
+ENV_DIR="$(cd ${0%/*}/..; pwd)"
+. ${ENV_DIR}/share/main.sh

assets/root/bin/linuxdeploy → assets/all/share/main.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+################################################################################
 #
-# Linux Deploy for Android
-# (C) 2012-2015 Anton Skshidlevsky <[email protected]>
+# Linux Deploy
+# (C) 2012-2015 Anton Skshidlevsky <[email protected]>, GPLv3
 #
 ################################################################################
 
@@ -106,7 +106,7 @@ partition)
 		msg "fail"; return 1
 	fi
 ;;
-ram)
+directory|ram)
 	if [ -e "${IMG_TARGET}" -a ! -d "${IMG_TARGET}" ]; then
 		msg "fail"; return 1
 	fi

res/menu/activity_mounts.xml

@@ -4,21 +4,21 @@
         android:id="@+id/menu_new"
         android:icon="@android:drawable/ic_menu_add"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_new">
     </item>
     <item
         android:id="@+id/menu_edit"
         android:icon="@android:drawable/ic_menu_edit"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_edit">
     </item>
     <item
         android:id="@+id/menu_discard"
         android:icon="@android:drawable/ic_menu_delete"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_discard">
     </item>
 

res/menu/activity_profiles.xml

@@ -4,21 +4,21 @@
         android:id="@+id/menu_new"
         android:icon="@android:drawable/ic_menu_add"
         android:orderInCategory="100"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_new">
     </item>
     <item
         android:id="@+id/menu_edit"
         android:icon="@android:drawable/ic_menu_edit"
         android:orderInCategory="100"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_edit">
     </item>
     <item
         android:id="@+id/menu_discard"
         android:icon="@android:drawable/ic_menu_delete"
         android:orderInCategory="100"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_discard">
     </item>
     <item

res/menu/activity_scripts.xml

@@ -4,21 +4,21 @@
         android:id="@+id/menu_new"
         android:icon="@android:drawable/ic_menu_add"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_new">
     </item>
     <item
         android:id="@+id/menu_edit"
         android:icon="@android:drawable/ic_menu_edit"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_edit">
     </item>
     <item
         android:id="@+id/menu_discard"
         android:icon="@android:drawable/ic_menu_delete"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_discard">
     </item>
 

res/values-de/arrays.xml

@@ -8,8 +8,8 @@
     <string-array name="deploytype_entries">
         <item>Datei</item>
         <item>Partition</item>
+        <item>Verzeichnis</item>
         <item>RAM</item>
-        <item>Benutzerdefiniert</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>

res/values-de/strings.xml

@@ -8,11 +8,6 @@
     <string name="menu_properties">Eigenschaften</string>
     <string name="menu_settings">Einstellungen</string>
     <string name="menu_about">&#220;ber</string>
-    <string name="menu_donate">Spenden</string>
-    <string name="menu_forum">Forum</string>
-    <string name="menu_doc">Dokumentation</string>
-    <string name="menu_issues">Fragen</string>
-    <string name="menu_source">Quellcode</string>
     <string name="menu_exit">Schlie&#223;en</string>
     <string name="menu_status">Status</string>
     <string name="menu_clear">Leeren</string>
@@ -62,21 +57,21 @@
     <string name="dialog_title_language_preference">Sprache ausw&#228;hlen</string>
     <string name="title_fontsize_preference">Schriftgr&#246;&#223;e</string>
     <string name="dialog_title_fontsize_preference">Schriftgr&#246;&#223;e</string>
-    <string name="title_maxline_preference">Scroll Gr&#246;&#223;e</string>
-    <string name="dialog_title_maxline_preference">Scroll Gr&#246;&#223;e</string>
+    <string name="title_maxlines_preference">Scroll Gr&#246;&#223;e</string>
+    <string name="dialog_title_maxlines_preference">Scroll Gr&#246;&#223;e</string>
     <string name="title_theme_preference">Design</string>
     <string name="dialog_title_theme_preference">Design ausw&#228;hlen</string>
+    <string name="title_timestamp_preference">Timestamp</string>
+    <string name="summary_timestamp_preference">Show timestamp</string>
     <string name="title_appicon_preference">Icon anzeigen</string>
     <string name="summary_appicon_preference">Ein Linux Deploy-Icon wird in der Benachrichtigungsleiste angezeigt.</string>
     <string name="title_autostart_preference">Autostart</string>
     <string name="summary_autostart_preference">Soll das GNU/Linux-System beim Hochfahren des Handys oder Tablets automatisch gestartet werden?</string>
     <string name="env_preferences">Betriebsumgebung (ENV)</string>
-    <string name="title_installdir_preference">ENV Verzeichnis</string>
-    <string name="dialog_title_installdir_preference">ENV Verzeichnis</string>
-    <string name="title_builtinshell_preference">Eingebaute Konsole</string>
-    <string name="summary_builtinshell_preference">Benutze die eingebaute BusyBox</string>
-    <string name="title_symlink_preference">Erstelle symlink</string>
-    <string name="summary_symlink_preference">Erstelle ein symbolischen Link auf linuxdeploy in Android</string>
+    <string name="title_busyboxdir_preference">BusyBox Verzeichnis</string>
+    <string name="dialog_title_busyboxdir_preference">BusyBox Verzeichnis</string>
+    <string name="title_usecli_preference">Use CLI</string>
+    <string name="summary_usecli_preference">Set up a command line interface</string>
     <string name="title_installenv_preference">Update ENV</string>
     <string name="summary_installenv_preference">Update die Betriebsumgebung(ENV)</string>
     <string name="message_installenv_confirm_dialog">Update die Betreibsumgebung(ENV)?</string>
@@ -88,8 +83,8 @@
     <string name="summary_debug_preference">Sehe die Debugging Information</string>
     <string name="title_trace_preference">Trace-Modus</string>
     <string name="summary_trace_preference">Aktiviere Trance-Modus</string>
-    <string name="title_logs_preference">Logging</string>
-    <string name="summary_logs_preference">Logs in einer Datei Speichern</string>
+    <string name="title_logger_preference">Logging</string>
+    <string name="summary_logger_preference">Logs in einer Datei Speichern</string>
     <string name="title_logfile_preference">Log Datei</string>
     <string name="dialog_title_logfile_preference">Log Datei</string>
     <string name="action_preferences">Aktion</string>
@@ -190,7 +185,7 @@
     <string name="dialog_title_fbargs_preference">FB: X Eigenschaften</string>
     <string name="title_fbfreeze_preference">Freeze Android UI</string>
     <string name="dialog_title_fbfreeze_preference">Freeze Android UI</string>
-    <string name="help_text">\n<b>Help</b>\n\nThis application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nProcedure:\n1. Get superuser privileges (root).\n2. Install BusyBox.\n3. Check the connection to Internet.\n4. Specify the installation options.\n5. Start the installation (\"Properties => Install\").\n6. Wait until the installation is complete.\n7. Tap \"START\" button to run the container.\n8. Connect to the container through CLI, SSH, VNC, or others.\n\nFor more information, see \"About\".</string>
-    <string name="about_text">This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.\n\nLicensed under the GPL version 3 or later.\n\n&#169; 2012&#8211;2015 Anton Skshidlevsky</string>
+    <string name="help_text">\n<b>Help</b>\n\nThis application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nProcedure:\n1. Get superuser privileges (root).\n2. Install <a href="https://play.google.com/store/apps/details?id=ru.meefik.busybox">BusyBox</a>.\n3. Check the connection to Internet.\n4. Specify the installation options.\n5. Start the installation (\"Properties => Install\").\n6. Wait until the installation is complete.\n7. Tap \"START\" button to run the container.\n8. Connect to the container through CLI, SSH, VNC, or others.\n\nFor more information, see \"About\".</string>
+    <string name="about_text">This application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nFor more information see <a href="https://github.com/meefik/linuxdeploy">project page</a>, <a href="http://4pda.ru/forum/index.php?showtopic=378043">forum</a> or <a href="http://meefik.ru">developer site</a>.\n\n&#169; 2012&#8211;2015 Anton Skshidlevsky, GPLv3</string>
 
 </resources>

res/values-es/arrays.xml

@@ -8,8 +8,8 @@
     <string-array name="deploytype_entries">
         <item>Archivo</item>
         <item>Partición</item>
+        <item>Directorio</item>
         <item>RAM</item>
-        <item>Personalizado</item>
     </string-array>
     <string-array name="fstype_entries">
         <item>Auto</item>

res/values-es/strings.xml

@@ -8,11 +8,6 @@
     <string name="menu_properties">Propiedades</string>
     <string name="menu_settings">Configuración</string>
     <string name="menu_about">Sobre</string>
-    <string name="menu_donate">Donar</string>
-    <string name="menu_forum">Discusiones</string>
-    <string name="menu_doc">Documentación</string>
-    <string name="menu_issues">Cuestiones</string>
-    <string name="menu_source">Código fuente</string>
     <string name="menu_exit">Salir</string>
     <string name="menu_status">Estado</string>
     <string name="menu_clear">Limpiar</string>
@@ -62,21 +57,21 @@
     <string name="dialog_title_language_preference">Elegir Lenguaje</string>
     <string name="title_fontsize_preference">Tamaño Fuente</string>
     <string name="dialog_title_fontsize_preference">Tamaño fuente</string>
-    <string name="title_maxline_preference">Tamaño desplazamiento</string>
-    <string name="dialog_title_maxline_preference">Tamaño desplazamiento</string>
+    <string name="title_maxlines_preference">Tamaño desplazamiento</string>
+    <string name="dialog_title_maxlines_preference">Tamaño desplazamiento</string>
     <string name="title_theme_preference">Tema</string>
     <string name="dialog_title_theme_preference">Elegir Tema</string>
+    <string name="title_timestamp_preference">Timestamp</string>
+    <string name="summary_timestamp_preference">Show timestamp</string>
     <string name="title_appicon_preference">Mostrar icono</string>
     <string name="summary_appicon_preference">Mostrar icono en barra de notificación</string>
     <string name="title_autostart_preference">AutoArranque</string>
     <string name="summary_autostart_preference">Automaticamente iniciar GNU/Linux cuando se encienda Android</string>
     <string name="env_preferences">Entorno Sistema operativo</string>
-    <string name="title_installdir_preference">directorio ENV (entorno)</string>
-    <string name="dialog_title_installdir_preference">directorio ENV (entorno)</string>
-    <string name="title_builtinshell_preference">Shell incorporado</string>
-    <string name="summary_builtinshell_preference">Incorporar BusyBox</string>
-    <string name="title_symlink_preference">Crear symlink</string>
-    <string name="summary_symlink_preference">Crear un link simbolico dentro de linuxdeploy en Android</string>
+    <string name="title_busyboxdir_preference">Directorio BusyBox</string>
+    <string name="dialog_title_busyboxdir_preference">Directorio BusyBox</string>
+    <string name="title_usecli_preference">Use CLI</string>
+    <string name="summary_usecli_preference">Set up a command line interface</string>
     <string name="title_installenv_preference">Actualizar ENV</string>
     <string name="summary_installenv_preference">Actualizar el sistema operativo</string>
     <string name="message_installenv_confirm_dialog">¿Actualizar el sistema operativo?</string>
@@ -88,8 +83,8 @@
     <string name="summary_debug_preference">Mostrar información de depuración</string>
     <string name="title_trace_preference">Modo seguimiento</string>
     <string name="summary_trace_preference">Habilitar modo seguimiento</string>
-    <string name="title_logs_preference">Logging</string>
-    <string name="summary_logs_preference">Guardar logs a un archivo</string>
+    <string name="title_logger_preference">Logging</string>
+    <string name="summary_logger_preference">Guardar logs a un archivo</string>
     <string name="title_logfile_preference">Archivo log</string>
     <string name="dialog_title_logfile_preference">Archivo log</string>
     <string name="action_preferences">Acción</string>
@@ -190,7 +185,7 @@
     <string name="dialog_title_fbargs_preference">FB: X opciones</string>
     <string name="title_fbfreeze_preference">Congelar Android UI</string>
     <string name="dialog_title_fbfreeze_preference">Congelar Android UI</string>
-    <string name="help_text">\n<b>Help</b>\n\nThis application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nProcedure:\n1. Get superuser privileges (root).\n2. Install BusyBox.\n3. Check the connection to Internet.\n4. Specify the installation options.\n5. Start the installation (\"Properties => Install\").\n6. Wait until the installation is complete.\n7. Tap \"START\" button to run the container.\n8. Connect to the container through CLI, SSH, VNC, or others.\n\nFor more information, see \"About\".</string>
-    <string name="about_text">Este programa viene sin ABSOLUTAMENTE NINGUNA GARANTÍA. Esto es software libre, y le invitamos a redistribuirlo bajo ciertas condiciones.\n\nLicensed under the GPL version 3 or later.\n\n&#169; 2012&#8211;2015 Anton Skshidlevsky</string>
+    <string name="help_text">\n<b>Help</b>\n\nThis application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nProcedure:\n1. Get superuser privileges (root).\n2. Install <a href="https://play.google.com/store/apps/details?id=ru.meefik.busybox">BusyBox</a>.\n3. Check the connection to Internet.\n4. Specify the installation options.\n5. Start the installation (\"Properties => Install\").\n6. Wait until the installation is complete.\n7. Tap \"START\" button to run the container.\n8. Connect to the container through CLI, SSH, VNC, or others.\n\nFor more information, see \"About\".</string>
+    <string name="about_text">This application installs the selected GNU/Linux distribution and executes it in a chroot-container.\n\nFor more information see <a href="https://github.com/meefik/linuxdeploy">project page</a>, <a href="http://4pda.ru/forum/index.php?showtopic=378043">forum</a> or <a href="http://meefik.ru">developer site</a>.\n\n&#169; 2012&#8211;2015 Anton Skshidlevsky, GPLv3</string>
 
 </resources>

res/values-fr/arrays.xml

@@ -8,11 +8,11 @@
     <string-array name="deploytype_entries">
         <item>Fichier</item>
         <item>Partition</item>
+        <item>Répertoire</item>
         <item>RAM</item>
-        <item>Sur mesure</item>
     </string-array>
     <string-array name="fstype_entries">
-        <item>Auto</item>
+        <item>Automatique</item>
         <item>ext2</item>
         <item>ext3</item>
         <item>ext4</item>