Skip to content

Commit

Permalink
macOS UTF8 fixes fixed #31, fixed #40
Browse files Browse the repository at this point in the history
  • Loading branch information
Eugeny committed Jul 8, 2017
1 parent 5096850 commit 980834d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
4 changes: 3 additions & 1 deletion terminus-terminal/src/persistenceProviders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
await fs.writeFile(configPath, `
escape ^^^
vbell on
deflogin off
deflogin on
term xterm-color
bindkey "^[OH" beginning-of-line
bindkey "^[OF" end-of-line
Expand All @@ -98,6 +98,8 @@ export class ScreenPersistenceProvider extends SessionPersistenceProvider {
defhstatus "^Et"
hardstatus off
altscreen on
defutf8 on
defencoding utf8
`, 'utf-8')
let recoveryId = `term-tab-${Date.now()}`
let args = ['-d', '-m', '-c', configPath, '-U', '-S', recoveryId, '-T', 'xterm-256color', '--', '-' + options.command].concat(options.args || [])
Expand Down
12 changes: 12 additions & 0 deletions terminus-terminal/src/services/sessions.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ export class Session {
...options.env,
TERM: 'xterm-256color',
}

if (process.platform === 'darwin' && !process.env.LC_ALL) {
let locale = process.env.LC_CTYPE || 'en_US.UTF-8'
Object.assign(env, {
LANG: locale,
LC_ALL: locale,
LC_MESSAGES: locale,
LC_NUMERIC: locale,
LC_COLLATE: locale,
LC_MONETARY: locale,
})
}
this.pty = nodePTY.spawn(options.command, options.args || [], {
name: 'xterm-256color',
cols: options.width || 80,
Expand Down

0 comments on commit 980834d

Please sign in to comment.