GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-09-24 09:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

strip data-volume prefix from CWD on Catalina

Browse Source
This commit is contained in:
Eugene Pankov
2019-06-28 10:29:56 +02:00
parent cc68ad492a
commit eb52a37f77
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
terminus-terminal/src/services/sessions.service.ts
View File

@@ -28,6 +28,7 @@ export interface ChildProcess {
} }
const windowsDirectoryRegex = /([a-zA-Z]:[^\:\[\]\?\"\<\>\|]+)/mi const windowsDirectoryRegex = /([a-zA-Z]:[^\:\[\]\?\"\<\>\|]+)/mi
const catalinaDataVolumePrefix = '/System/Volumes/Data'
const OSC1337Prefix = '\x1b]1337;' const OSC1337Prefix = '\x1b]1337;'
const OSC1337Suffix = '\x07' const OSC1337Suffix = '\x07'
@@ -282,11 +283,11 @@ export class Session extends BaseSession {
} catch (e) { } catch (e) {
return null return null
} }
if (lines[1] === 'fcwd') { let cwd = lines[(lines[1] === 'fcwd') ? 2 : 1].substring(1)
return lines[2].substring(1) if (cwd.startsWith(catalinaDataVolumePrefix)) {
} else { cwd = cwd.substring(catalinaDataVolumePrefix.length)
return lines[1].substring(1)
} }
return cwd
} }
if (process.platform === 'linux') { if (process.platform === 'linux') {
return fs.readlink(`/proc/${this.truePID}/cwd`) return fs.readlink(`/proc/${this.truePID}/cwd`)