diff options
| author | katherine <shmibs@shmibbles.me> | 2016-01-22 05:24:38 -0700 |
|---|---|---|
| committer | katherine <shmibs@shmibbles.me> | 2016-01-22 05:24:38 -0700 |
| commit | 8254675dff09cbcf45555136f775a893fe6846a2 (patch) | |
| tree | 35ed7b86d170126fa48bcdbb5b3d6ae57ef1f962 | |
| parent | 52850cd050a543c5a00eadeec70ed385f9176d98 (diff) | |
| parent | 263e556e523ca5817efa4f717d532a5cc1035a5e (diff) | |
| download | dotfiles-8254675dff09cbcf45555136f775a893fe6846a2.tar.gz | |
Merge branch 'master' of github.com:shmibs/dotfiles
| -rw-r--r-- | .zprofile | 5 | ||||
| -rw-r--r-- | .zprofile-dtach | 57 | ||||
| -rw-r--r-- | .zshrc | 5 | ||||
| -rw-r--r-- | .zshrc-remote | 59 |
4 files changed, 62 insertions, 64 deletions
@@ -1,3 +1,8 @@ emulate sh -c 'source /etc/profile' export QT_STYLE_OVERRIDE=gtk + +############# CONNECTING OVER SSH ############# +if [[ -a ~/.zprofile-dtach ]]; then + source ~/.zprofile-dtach +fi diff --git a/.zprofile-dtach b/.zprofile-dtach new file mode 100644 index 0000000..6f57ef7 --- /dev/null +++ b/.zprofile-dtach @@ -0,0 +1,57 @@ +if [[ -z "${DTACH_SUB}" ]]; then +{ + setopt NULL_GLOB + + while true; do + set -- /tmp/dtach* + if [[ "$#" -gt 0 ]]; then + # session exists, so show the menu + { + while true; do + set -- /tmp/dtach* + if [[ "$#" -eq 0 ]]; then + # logout if all sessions terminated + clear + logout + fi + + # list sessions + set -- /tmp/dtach* + if [[ "$#" -gt 0 ]]; then + ls /tmp/dtach* | sed 's/\/tmp\/dtach-//g' + fi + + echo -n "> " + read -A args + case "${args[1]}" in + q) + break; + ;; + + *) + if [[ "${args[1]}" != "q" ]]; then + DTACH_SUB=true dtach -A "/tmp/dtach-${args[1]}" -z zsh + clear + fi + ;; + esac + + done + } + + clear + logout + else + # create the main session + DTACH_SUB=true dtach -A /tmp/dtach-1 -z zsh + clear + set -- /tmp/dtach* + if [[ "$#" -eq 0 ]]; then + # logout if all sessions terminated + clear + logout + fi + fi + done +} +fi @@ -112,8 +112,3 @@ case $(uname) in *) echo -e '[-- OS UNRECOGNISED --]' esac - -############# CONNECTING OVER SSH ############# -if [[ -a ~/.zshrc-remote ]]; then - source ~/.zshrc-remote -fi diff --git a/.zshrc-remote b/.zshrc-remote deleted file mode 100644 index 98ac9d6..0000000 --- a/.zshrc-remote +++ /dev/null @@ -1,59 +0,0 @@ -if [[ $TERM != "screen" ]]; then - tmux has-session 2>/dev/null - if [[ "$?" != "0" ]]; then - tmux - fi - - tmux has-session 2>/dev/null - if [[ "$?" != "0" ]]; then - logout - fi - - { - while true; do - tmux has-session 2>/dev/null - if [[ "$?" != "0" ]]; then - logout - fi - - echo "" - tmux list-sessions - - echo -n "> " - read -A args - case "${args[1]}" in - a) - if [[ "${args[2]}" != "" ]]; then - tmux has-session -t "${args[2]}" - if [[ "$?" == "0" ]]; then - tmux attach-session -t "${args[2]}" - fi - fi - ;; - - k) - if [[ "${args[2]}" != "" ]]; then - tmux has-session -t "${args[2]}" - if [[ "$?" == "0" ]]; then - tmux kill-session -t "${args[2]}" - fi - fi - ;; - - n) - tmux new-session - ;; - - q) - break; - ;; - - *) - ;; - esac - - done - } - - logout -fi |