1.4.1

Former-commit-id: a679750
meefik · Jul 26, 2013 · fb918ad · fb918ad
1 parent 3628301
commit fb918ad
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 18 deletions.
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="80"
-    android:versionName="1.4.0" >
+    android:versionCode="81"
+    android:versionName="1.4.1" >
 
     <uses-sdk
         android:minSdkVersion="7" android:targetSdkVersion="16"/>

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,13 +1,17 @@
 Changelog (English)
 ===================
 
+1.4.1
+Added support for installation from rootfs archives (tgz)
+Bugfix: changing font size
+
 1.4.0
 Added function of import/export profiles
 Support Android 2.1 (API 7)
 Updated list of packages openSUSE (armv7hl)
 Added support Fedora 19
 Automatic detection of screen resolution (for VNC)
-Improved command line utility linuxdeploy (added prepare and generic commands)
+Improved command line utility linuxdeploy
 
 1.3.9
 Added support Gentoo (installation requires at least 4 GB of free space)
@@ -210,13 +214,17 @@ Updated list packages of base system installation
 История изменений (Русский)
 ===========================
 
+1.4.1
+Добавлена поддержка установки дистрибутивов из rootfs архивов (tgz)
+Исправлено изменение размера шрифта 
+
 1.4.0
 Добавлена функция импорта/экспорта профилей
 Поддержка Android 2.1 (API 7)
 Обновлен список пакетов openSUSE (armv7hl)
 Добавлена поддержка Fedora 19
 Автоматическое определение разрешение экрана (для VNC)
-Доработана консольная утилита linuxdeploy (добавлены команды prepare и generic)
+Доработана консольная утилита linuxdeploy
 
 1.3.9
 Добавлена поддержка Gentoo (для установки необходимо не менее 4 GB свободного места)

diff --git a/assets/home/bin/linuxdeploy b/assets/home/bin/linuxdeploy
@@ -50,12 +50,12 @@ msg()
 
 prepare_system()
 {
-	msg -n "Checking target path ... "
+	msg -n "Checking target mount point ... "
 	is_mnt=`cat /proc/mounts | grep " $MNT_TARGET "`
 	if [ -n "$is_mnt" ]; then
 		msg "busy"; return 1
 	else
-		msg "done"
+		msg "ready"
 	fi
 
 	msg -n "Checking installation path ... "
@@ -1225,6 +1225,26 @@ install_system()
 		find $MNT_TARGET/ -name "._cfg0000_*" | while read f; do mv "$f" "$(echo $f | sed 's/._cfg0000_//g')"; done
 		[ $? -eq 0 ] && msg "done" || msg "skip"
 	;;
+	custom)
+		msg "Getting and unpacking rootfs archive: "
+		if [ -e "$MIRROR" ]; then
+			(set -e
+				tar xzpvf "$MIRROR" -C $MNT_TARGET
+			exit 0) 1>&3 2>&3
+			[ $? -eq 0 ] || return 1
+		fi
+		if [ -n "`echo $MIRROR | grep -i ^http`" ]; then
+			(set -e
+				wget -q -O - "$MIRROR" | tar xzpv -C $MNT_TARGET
+			exit 0) 1>&3 2>&3
+			[ $? -eq 0 ] || return 1 
+		fi
+		[ "`ls $MNT_TARGET | wc -l`" -le 1 ] && { msg " ...installation failed."; return 1; }
+	;;
+	*)
+		msg "This Linux distribution not supported."
+		return 1
+	;;
 	esac
 
 	configure_system
@@ -1350,15 +1370,6 @@ configure)
 	[ $? -eq 0 ] && configure_system
 	msg "<<< end: $1"
 ;;
-generic)
-	msg ">>> begin: $1"
-	mount_system
-	if [ $? -eq 0 ]; then
-		DISTRIB=generic
-		configure_system
-	fi
-	msg "<<< end: $1"
-;;
 start)
 	msg ">>> begin: $1"
 	start_system
@@ -1390,6 +1401,6 @@ status)
 	msg "<<< end: $1"
 ;;
 *)
-	msg "Usage: $0 <mount|prepare|install|configure|generic|start|stop|umount|uninstall|shell|status>"
+	msg "Usage: $0 <mount|prepare|install|configure|start|stop|umount|uninstall|shell|status>"
 ;;
 esac
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
@@ -24,5 +24,15 @@
         <item>KDE</item>
         <item>Другое</item>
     </string-array>
+    <string-array name="distribution_entries">
+        <item>Debian</item>
+        <item>Ubuntu</item>
+        <item>Arch Linux</item>
+        <item>Fedora</item>
+        <item>openSUSE</item>
+        <item>Kali Linux</item>
+        <item>Gentoo</item>
+        <item>Другой</item>
+    </string-array>
 
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -73,15 +73,17 @@
         <item>opensuse</item>
         <item>kali</item>
         <item>gentoo</item>
+        <item>custom</item>
     </string-array>
-    <string-array name="distribution_entries" translatable="false">
+    <string-array name="distribution_entries">
         <item>Debian</item>
         <item>Ubuntu</item>
         <item>Arch Linux</item>
         <item>Fedora</item>
         <item>openSUSE</item>
         <item>Kali Linux</item>
         <item>Gentoo</item>
+        <item>Other</item>
     </string-array>
 
     <!-- Debian -->

diff --git a/res/values/preferences.xml b/res/values/preferences.xml
@@ -84,5 +84,5 @@
     <string name="gentoo_suite" translatable="false">latest</string>
     <string name="gentoo_mirror" translatable="false">http://mirror.yandex.ru/gentoo-distfiles/releases/</string>
     <string name="gentoo_architecture" translatable="false">armv7a</string>
-    
+
 </resources>
diff --git a/src/ru/meefik/linuxdeploy/DeployPrefsActivity.java b/src/ru/meefik/linuxdeploy/DeployPrefsActivity.java
@@ -221,6 +221,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.debian_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -231,12 +232,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.debian_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.debian_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("ubuntu")) {
 					// suite
@@ -247,6 +250,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.ubuntu_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -257,12 +261,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.ubuntu_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.ubuntu_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("archlinux")) {
 					// suite
@@ -273,6 +279,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.archlinux_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -284,12 +291,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.archlinux_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.archlinux_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("fedora")) {
 					// suite
@@ -300,6 +309,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.fedora_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -310,12 +320,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.fedora_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.fedora_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("opensuse")) {
 					// suite
@@ -326,6 +338,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.opensuse_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -337,12 +350,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.opensuse_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.opensuse_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("kali")) {
 					// suite
@@ -353,6 +368,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.kali_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -363,12 +379,14 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.kali_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.kali_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 				if (listPref.getValue().equals("gentoo")) {
 					// suite
@@ -379,6 +397,7 @@ private void setSummary(Preference pref, boolean init) {
 					if (init)
 						suite.setValue(getString(R.string.gentoo_suite));
 					suite.setSummary(suite.getEntry());
+					suite.setEnabled(true);
 					// architecture
 					ListPreference architecture = (ListPreference) this
 							.findPreference("architecture");
@@ -389,12 +408,42 @@ private void setSummary(Preference pref, boolean init) {
 						architecture
 								.setValue(getString(R.string.gentoo_architecture));
 					architecture.setSummary(architecture.getEntry());
+					architecture.setEnabled(true);
 					// mirror
 					EditTextPreference mirror = (EditTextPreference) this
 							.findPreference("mirror");
 					if (init)
 						mirror.setText(getString(R.string.gentoo_mirror));
 					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
+				}
+				if (listPref.getValue().equals("custom")) {
+					// suite
+					ListPreference suite = (ListPreference) this
+							.findPreference("suite");
+					suite.setEntries(null);
+					suite.setEntryValues(null);
+					suite.setValue("unknown");
+					suite.setSummary(null);
+					suite.setEnabled(false);
+					// architecture
+					ListPreference architecture = (ListPreference) this
+							.findPreference("architecture");
+					architecture.setEntries(null);
+					architecture.setEntryValues(null);
+					architecture.setValue("unknown");
+					architecture.setSummary(null);
+					architecture.setEnabled(false);
+					// mirror
+					EditTextPreference mirror = (EditTextPreference) this
+							.findPreference("mirror");
+					if (init) {
+						File extStore = Environment.getExternalStorageDirectory();
+						String archiveFile = extStore.getAbsolutePath()+"/linux-rootfs.tar.gz";
+						mirror.setText(archiveFile);
+					}
+					mirror.setSummary(mirror.getText());
+					mirror.setEnabled(true);
 				}
 			}
 			if (listPref.getKey().equals("deploytype")) {

diff --git a/src/ru/meefik/linuxdeploy/MainActivity.java b/src/ru/meefik/linuxdeploy/MainActivity.java
@@ -20,6 +20,7 @@
 import android.os.Handler;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.ScrollView;
@@ -281,6 +282,9 @@ public void onResume() {
 		// show icon
 		notification(getApplicationContext(), this.getIntent());
 
+		// Restore font size
+		logView.setTextSize(TypedValue.COMPLEX_UNIT_SP, PrefStore.FONT_SIZE);
+
 		// Restore log
 		showLog();