summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2013-03-03 22:37:07 (GMT)
committer Jaromil <jaromil@dyne.org>2013-03-03 22:37:07 (GMT)
commit1414056816360e203abd3ac9fc67e4f98992f376 (patch)
tree8e90c4b86dcd1958f0c9beb8491ef230ac0a981b
parentb3ce4968b926572010cb359b10cf5001d65260e6 (diff)
fixes and release updatesv0.7
scp wrapper (rename binaries in pack now possible) and more cleanups
-rw-r--r--VERSION2
-rw-r--r--build/opkg/Sources10
-rwxr-xr-xbuild/opkg/bin/scp.wrap8
-rw-r--r--build/opkg/etc/opkg.conf16
-rw-r--r--pack/conf.zsh14
-rw-r--r--pack/media.version1
-rw-r--r--pack/opkg.tree23
-rw-r--r--pack/system.tree1
-rw-r--r--pack/system.version1
-rw-r--r--termapk/res/layout-land/main.xml2
-rw-r--r--termapk/res/layout/main.xml2
-rw-r--r--termapk/src/com/spartacusrex/spartacuside/EmulatorView.java2
-rw-r--r--termapk/src/org/dyne/zshaolin/startup/installer.java6
13 files changed, 72 insertions, 16 deletions
diff --git a/VERSION b/VERSION
index 844f6a9..eb49d7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.3
+0.7
diff --git a/build/opkg/Sources b/build/opkg/Sources
index 0004305..bc7b117 100644
--- a/build/opkg/Sources
+++ b/build/opkg/Sources
@@ -1,9 +1,9 @@
curl _7.24.0-3_armeabi .opk
dropbear _2011.54-1_armeabi .opk
-nmap _5.51-1_armeabi .opk
+# nmap _5.51-1_armeabi .opk
opkg _0.1.8-7_armeabi .opk
rsync _3.0.9-0_armeabi .opk
-tcpdump _4.2.1-0_armeabi .opk
-vim _7.3-2_armeabi .opk
-lighttpd _1.4.30-0_armeabi .opk
-git _1.7.10.0-0_armeabi .opk \ No newline at end of file
+# tcpdump _4.2.1-0_armeabi .opk
+# vim _7.3-2_armeabi .opk
+# lighttpd _1.4.30-0_armeabi .opk
+git _1.7.10.0-0_armeabi .opk
diff --git a/build/opkg/bin/scp.wrap b/build/opkg/bin/scp.wrap
new file mode 100755
index 0000000..08ba602
--- /dev/null
+++ b/build/opkg/bin/scp.wrap
@@ -0,0 +1,8 @@
+#!/data/data/org.dyne.zshaolin/files/system/bin/zsh
+
+/data/data/org.dyne.zshaolin/files/system/bin/scp.bin \
+ -S /data/data/org.dyne.zshaolin/files/system/bin/dbclient \
+ ${=@}
+
+
+
diff --git a/build/opkg/etc/opkg.conf b/build/opkg/etc/opkg.conf
new file mode 100644
index 0000000..0876e85
--- /dev/null
+++ b/build/opkg/etc/opkg.conf
@@ -0,0 +1,16 @@
+option offline_root /data/data/org.dyne.zshaolin/opkg
+option tmp_dir /data/data/org.dyne.zshaolin/opkg/tmp
+option cache /data/data/org.dyne.zshaolin/opkg/cache
+
+dest root /
+#/data/data/org.dyne.zshaolin/opkg
+
+arch armeabi 5
+arch arm 6
+arch encore 7
+arch all 10
+arch any 20
+arch noarch 30
+
+src/gz botbrew http://repo.botbrew.com/stable/main
+src/gz snapshots http://dan.drown.org/android/pkg/
diff --git a/pack/conf.zsh b/pack/conf.zsh
index 9209710..7b36fe1 100644
--- a/pack/conf.zsh
+++ b/pack/conf.zsh
@@ -13,11 +13,23 @@ sync_module() {
rm -f all.tree && touch all.tree
rm -f all.aliases && touch all.aliases
for t in `find . -name '*.tree'`; do
- cat $t | sort >> all.tree; done
+ # only first arg (2nd for rename, would break rsync)
+ cat $t | awk '{print $1}' | sort >> all.tree; done
for a in `find . -name '*.aliases'`; do
cat $a | sort >> all.aliases; done
rsync -dar --files-from=all.tree $ZHOME/system/ system/
+
+ # rename those that need it (2nd arg in .tree)
+ for t in `find . -name '*.tree'`; do
+ for i in `cat ${t} | awk '{if($2) print $1 ";" $2}'`; do
+ src=${i[(ws:;:)1]}
+ dst=${i[(ws:;:)2]}
+ act "rename $src in $dst"
+ mv system/${src} system/${dst}
+ done
+ done
+
}
strip_module() {
diff --git a/pack/media.version b/pack/media.version
deleted file mode 100644
index ceab6e1..0000000
--- a/pack/media.version
+++ /dev/null
@@ -1 +0,0 @@
-0.1 \ No newline at end of file
diff --git a/pack/opkg.tree b/pack/opkg.tree
new file mode 100644
index 0000000..7e32b16
--- /dev/null
+++ b/pack/opkg.tree
@@ -0,0 +1,23 @@
+./share/misc
+./share/ncat
+./share/opkg
+./share/git-core
+./bin/xxd
+./bin/ndiff
+./bin/scp ./bin/scp.bin
+./bin/scp.wrap ./bin/scp
+./bin/rsync
+./bin/opkg-key
+./bin/dropbearkey
+./bin/curl
+./bin/dbclient
+./bin/file
+./bin/opkg
+./bin/sqlite3
+./bin/dropbear
+./bin/dropbearconvert
+./bin/git
+./etc/opkg.conf
+./etc/service
+./libexec
+
diff --git a/pack/system.tree b/pack/system.tree
index 6f657ce..8f96ef1 100644
--- a/pack/system.tree
+++ b/pack/system.tree
@@ -20,7 +20,6 @@
./bin/most
./bin/nano
./bin/gawk
-./bin/netcat
./bin/diff
./bin/zsh
./bin/grep
diff --git a/pack/system.version b/pack/system.version
deleted file mode 100644
index 5a2a580..0000000
--- a/pack/system.version
+++ /dev/null
@@ -1 +0,0 @@
-0.6
diff --git a/termapk/res/layout-land/main.xml b/termapk/res/layout-land/main.xml
index 2e486de..7db405e 100644
--- a/termapk/res/layout-land/main.xml
+++ b/termapk/res/layout-land/main.xml
@@ -73,7 +73,7 @@
android:textColor="#ffffff"
android:textSize="12dip"
android:text="ZShaolin.org\n
-by Jaromil @ dyne.org (2012)"/>
+by Jaromil @ dyne.org (2013)"/>
</LinearLayout>
diff --git a/termapk/res/layout/main.xml b/termapk/res/layout/main.xml
index bdc2fb4..783e32c 100644
--- a/termapk/res/layout/main.xml
+++ b/termapk/res/layout/main.xml
@@ -68,7 +68,7 @@
android:textColor="#ffffff"
android:textSize="12dip"
android:text="ZShaolin.org\n
-by Jaromil @ dyne.org (2012)"/>
+by Jaromil @ dyne.org (2013)"/>
</LinearLayout>
diff --git a/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java b/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
index 15f89b6..000a8b9 100644
--- a/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
+++ b/termapk/src/com/spartacusrex/spartacuside/EmulatorView.java
@@ -1284,7 +1284,7 @@ class PaintRenderer extends BaseTextRenderer {
mTextPaint.setTypeface(_font);
} else mTextPaint.setTypeface(Typeface.MONOSPACE);
- mTextPaint.setAntiAlias(false);
+ mTextPaint.setAntiAlias(true);
mTextPaint.setTextSize(fontSize);
mCharHeight = (int) Math.ceil(mTextPaint.getFontSpacing());
diff --git a/termapk/src/org/dyne/zshaolin/startup/installer.java b/termapk/src/org/dyne/zshaolin/startup/installer.java
index 7438046..d0468e8 100644
--- a/termapk/src/org/dyne/zshaolin/startup/installer.java
+++ b/termapk/src/org/dyne/zshaolin/startup/installer.java
@@ -38,9 +38,9 @@ import org.dyne.zshaolin.startup.setup.filemanager;
public class installer extends Activity implements OnClickListener{
//THE MAIN INSTALL VALUE
- public static int CURRENT_INSTALL_SYSTEM_NUM = 7;
- public static String CURRENT_INSTALL_SYSTEM = "System v0.6.3";
- public static String CURRENT_INSTALL_ASSETFILE = "system-0.6.3.tar.lzma.mp3";
+ public static int CURRENT_INSTALL_SYSTEM_NUM = 9;
+ public static String CURRENT_INSTALL_SYSTEM = "System v0.7";
+ public static String CURRENT_INSTALL_ASSETFILE = "system-0.7.tar.lzma.mp3";
private ProgressDialog mInstallProgress;