Skip to content

Commit a1c6e67

Browse files
authored
Merge pull request #2032 from FabianKramm/master
refactor: disable screen for older config versions
2 parents ba7a04d + 2ba19f0 commit a1c6e67

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

pkg/devspace/config/versions/v1beta11/upgrade.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
749749
WorkDir: c.Dev.Terminal.WorkDir,
750750
Enabled: ptr.Bool(!c.Dev.Terminal.Disabled),
751751
DisableReplace: true,
752+
DisableScreen: true,
752753
}
753754
}
754755
}

pkg/devspace/services/targetselector/until_newest_running.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ type relevantObject struct {
179179
}
180180

181181
func displayWarnings(ctx context.Context, relevantObjects []relevantObject, namespace string, client kubectl.Client, filter []string, log log.Logger) []string {
182+
if namespace == "" {
183+
namespace = client.Namespace()
184+
}
185+
182186
events, err := client.KubeClient().CoreV1().Events(namespace).List(ctx, metav1.ListOptions{})
183187
if err != nil {
184188
log.Debugf("Error retrieving pod events: %v", err)

pkg/devspace/services/terminal/terminal.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ if command -v screen; then
191191
if [ ! -f ~/.screenrc ]; then
192192
echo "termcapinfo xterm* ti@:te@" > ~/.screenrc
193193
echo "logfile /tmp/terminal-log.0" >> ~/.screenrc
194+
echo "escape ^tt" >> ~/.screenrc
194195
fi
195196
else
196197
echo "Couldn't find screen, need to fallback."

0 commit comments

Comments
 (0)