← Back to branch summary

~ubuntu-branches/ubuntu/karmic/byobu/karmic

« back to all changes in this revision

Viewing changes to byobu-launcher

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2009-10-01 21:43:41 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20091001214341-l23jlojjplusoeju
Tags: 2.36-0ubuntu1
https://launchpad.net/bugs/439524
https://launchpad.net/bugs/440221
* bin/fan_speed: improve the logic for find the fan_speed system monitor
  LP: #439524
* byobu-launcher, byobu-janitor: sometimes the ssh socket link can become
  a symlink to itself, causing byobu to fail to start due to too many
  levels of symlinks; remove the link first, before creating it;
  LP: #440221

Show diffs side-by-side

added added

removed removed

Lines of Context:
byobu-launcher
33
33
        # Set window title
34
34
        printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
35
35
        # Update ssh-agent socket
36
 
        [ -r "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ] &&  ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
 
36
        if [ -S "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then 
 
37
                rm -f "$RUN/$PKG.ssh-agent"
 
38
                ln -sf "$SSH_AUTH_SOCK" "$RUN/$PKG.ssh-agent"
 
39
        fi
37
40
        # Re-attach to existing session
38
41
        exec screen -xRR
39
42
fi