summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-06-30 09:10:03 (GMT)
committer Jaromil <jaromil@dyne.org>2014-06-30 09:20:50 (GMT)
commitb9e0eab706a82cfeeb23a9d8b9f6c3ad3d033259 (patch)
treedc5ca02303d82df8d2774e1d5645a247c691cd03
parent147d55f2b646f6319fb16bfb5786fb6cb243d5f9 (diff)
core system updates to environment
-rw-r--r--build/system/Sources7
-rw-r--r--build/system/conf.zsh16
-rw-r--r--build/system/etc/skel/zshrc10
-rwxr-xr-xbuild/system/etc/zlogin26
4 files changed, 43 insertions, 16 deletions
diff --git a/build/system/Sources b/build/system/Sources
index 24aedeb..21a3690 100644
--- a/build/system/Sources
+++ b/build/system/Sources
@@ -3,7 +3,8 @@
zlib -1.2.5 .tar.gz http://www.gnu.org
ncurses -5.9 .tar.gz
slang -2.2.4 .tar.bz2 http://www.jedsoft.org/slang
-zsh -4.3.15 .tar.bz2 http://www.zsh.org
+zsh -5.0.2 .tar.bz2 http://www.zsh.org
+# zsh -4.3.15 .tar.bz2 http://www.zsh.org
sed -4.2.1 .tar.bz2 http://www.gnu.org
gawk -4.0.0 .tar.bz2 http://www.gnu.org
grep -2.9 .tar.gz http://www.gnu.org
@@ -15,8 +16,8 @@ htop -1.0 .tar.gz
nano -2.2.6 .tar.gz
wipe -2.3.1 .tar.bz2
-#libevent -2.0.21-stable .tar.gz http://libevent.org/
-#tmux -1.7 .tar.gz http://tmux.sourceforge.net/
+libevent -2.0.21-stable .tar.gz http://libevent.org/
+tmux -1.8 .tar.gz http://tmux.sourceforge.net/
# netcat -0.7.1 .tar.gz
# opkg -0.1.8 .tar.gz
diff --git a/build/system/conf.zsh b/build/system/conf.zsh
index 5a10353..fe8a3d1 100644
--- a/build/system/conf.zsh
+++ b/build/system/conf.zsh
@@ -2,10 +2,6 @@
# (C) 2012 Denis Roio - GNU GPL v3
# refer to zmake for license details
-# configure the logfile
-LOGS=build.log
-rm -f $LOGS; touch $LOGS
-
# download and decompress all sources
prepare_sources
@@ -38,6 +34,8 @@ ln -sf libncursesw.a libncurses.a
ln -sf libncursesw.a libcurses.a
popd
+compile zsh default
+zinstall zsh
## s-lang
notice "Building S-Lang"
@@ -45,7 +43,7 @@ notice "Building S-Lang"
pushd slang
zconfigure default # --disable-static
{ test $? = 0 } && {
- pushd src && make static >> $LOGS
+ pushd src && make static
{ test $? = 0 } && { touch ../../slang.done }
popd }
popd }
@@ -111,12 +109,14 @@ compile wipe default
## libevent
-#compile libevent default
-#zinstall libevent
+compile libevent default
+zinstall libevent
## tmux
#compile tmux default "--enable-static"
-#zinstall tmux
+pushd tmux
+zmake
+zinstall tmux
## Opkg
# compile opkg default "--disable-curl --disable-gpg --disable-shave"
diff --git a/build/system/etc/skel/zshrc b/build/system/etc/skel/zshrc
index bcc156f..4d60360 100644
--- a/build/system/etc/skel/zshrc
+++ b/build/system/etc/skel/zshrc
@@ -5,7 +5,7 @@
# setup zsh modules path
fpath=(
- $SYS/share/zsh/4.3.15/functions
+ $SYS/share/zsh/5.0.2/functions
$SYS/share/zsh/site-functions
)
@@ -16,7 +16,13 @@ source $SYS/etc/grmlrc
# Vim configuration
export VIMRUNTIME=${SYS}/share/vim/vim73
+# Midnight commander
+alias mc='mc -aX' # correct rendering
+
+# Lynx web browser
+alias lynx="lynx -cfg ${SYS}/etc/lynx.cfg -lss ${SYS}/etc/lynx.lss"
+
# Custom user configuration
{ test -r ~/.profile } && { source ~/.profile }
-return 0 \ No newline at end of file
+return 0
diff --git a/build/system/etc/zlogin b/build/system/etc/zlogin
index 254eb83..df59bed 100755
--- a/build/system/etc/zlogin
+++ b/build/system/etc/zlogin
@@ -1,18 +1,38 @@
#!env sh
# ZShaolin initialization
-
+#
+# To include permanent changes, use .profile in your HOME directory
+# which is:
export HOME=/data/data/org.dyne.zshaolin/files
+# and can be abbreviated in ~/.profile
+# included from our ~/.zshrc (which also gets rewritten here)
+
export SYS=$HOME/system
export PATH=$SYS/bin:$SYS/sbin:$SYS/busybox/bin:$SYS/busybox/sbin:/system/xbin:$PATH
export SHELL="$SYS/bin/zsh"
-export TMPDIR=$ZHOME/tmp
+export TMPDIR=$HOME/tmp
export MANPATH=$SYS/share/man
export MANPAGER=most
export TERMINFO=$SYS/share/terminfo
export TERM=linux
-alias mc='mc -aX' # correct midnight rendering
+# restores home configurations if absent or empty
+function restore_rc() {
+ rc="$1"
+ res=0
+ if ! [ -r "$HOME/.$rc" ]; then
+ cp -f "$SYS/etc/skel/$rc" "$HOME/.$rc"; res=1
+ else
+ file $HOME/.$rc | grep empty > /dev/null
+ if [ $? = 0 ]; then cp -f "$SYS/etc/skel/$rc" "$HOME/.$rc"; res=1; fi
+ fi
+ if [ "$res" = "1" ]; then echo " . restored: ~/.$rc"; fi
+}
cd $HOME
echo "Welcome to ZShaolin"
+restore_rc zshrc
+restore_rc profile
+restore_rc vimrc
+restore_rc grml.conf
zsh