summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-10-11 10:55:43 (GMT)
committer Jaromil <jaromil@dyne.org>2014-10-11 10:55:43 (GMT)
commit60ed834b3731bfcd54e8237c0fa5376d5f01b3a8 (patch)
tree4d82efd94348ff1d83e6e5dd0b1439dc068a7667
parent4ffdc8768281d8f2898c66ecea6796a1fce1fd82 (diff)
added minimal configuration to fix tmux
-rw-r--r--conf/etc/skel/tmux.conf5
-rwxr-xr-xconf/etc/zlogin1
-rwxr-xr-xconf/helpers/z-ssh2
3 files changed, 7 insertions, 1 deletions
diff --git a/conf/etc/skel/tmux.conf b/conf/etc/skel/tmux.conf
new file mode 100644
index 0000000..cc6ef4e
--- /dev/null
+++ b/conf/etc/skel/tmux.conf
@@ -0,0 +1,5 @@
+# minimalist configuration to make tmux work on ZShaolin
+# tweak as you please, this file won't be overwritten
+
+# Just do not change the line below
+set-option -g default-shell $SYS/bin/zsh
diff --git a/conf/etc/zlogin b/conf/etc/zlogin
index 9dd68e9..24bb572 100755
--- a/conf/etc/zlogin
+++ b/conf/etc/zlogin
@@ -36,4 +36,5 @@ restore_rc zshrc
restore_rc profile
restore_rc vimrc
restore_rc grml.conf
+restore_rc tmux.conf
zsh
diff --git a/conf/helpers/z-ssh b/conf/helpers/z-ssh
index 72697af..d368f2a 100755
--- a/conf/helpers/z-ssh
+++ b/conf/helpers/z-ssh
@@ -67,7 +67,7 @@ this needs to be copied to the client device to be used.
At your terminal convenience, download and run in few steps:
- curl http://$IP:$httpport/ssh-to-z.sh ; sh ssh-to-z.sh
+ curl http://$IP:$httpport/ssh-to-z.sh -O; sh ssh-to-z.sh
It logins for you and creates a zshaolin.key for later use