Skip to content

Commit

Permalink
Merge pull request #54 from datawire/bugfix/runshell-tmux
Browse files Browse the repository at this point in the history
Fix terminal issues.

Fixes #51.
Fixes #52.
  • Loading branch information
itamarst committed Mar 21, 2017
2 parents b52c44c + b0b0fcb commit 3606bbf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cli/telepresence
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,11 @@ def run_local_command(runner, args, out_env, container_id):
# Don't use runner.popen() since we want to give program access to current
# stdout and stderr if it wants it.
env["PROMPT_COMMAND"] = (
'PS1="\e[1m@{}\e[0m|$PS1";unset PROMPT_COMMAND'.format(
'PS1="@{}|$PS1";unset PROMPT_COMMAND'.format(
runner.get_output(["kubectl", "config", "current-context"]).strip()
)
)
p = Popen(["torsocks", "/bin/bash", "-i", "-l"], env=env)
p = Popen(["torsocks", "/bin/bash", "-i"], env=env)

def terminate_if_alive():
os.remove(tor_conffile.name)
Expand Down
18 changes: 18 additions & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,24 @@ Some alternatives to Telepresence:

## Changelog

### 0.17 (Unreleased)

Bug fixes:

* Fix problem with tmux and wrapping when using `--run-shell`.
Thanks to Jean-Paul Calderone for the bug report.
([#51](https://github.com/datawire/telepresence/issues/51))
* Fix problem with non-login shells, e.g. with gnome-terminal.
Thanks to Jean-Paul Calderone for the bug report.
([#52](https://github.com/datawire/telepresence/issues/52))

### 0.16 (March 20, 2017)

Bug fixes:

* Disable `--run-shell` on OS X, hopefully temporarily, since it has issues with System Integrity Protection.
* Fix Python 3 support for running `telepresence`.

### 0.14 (March 20, 2017)

Features:
Expand Down

0 comments on commit 3606bbf

Please sign in to comment.