feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Terminal: Fix env separator

Browse Source 
Change-Id: I738ff27d37df95170bbdc9f55fbaf6430ebb5a40
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2024-01-26 09:46:56 +01:00
parent 946efb14b1
commit 56f42c319e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/terminal/shellintegration.cpp
View File

@@ -184,13 +184,17 @@ void ShellIntegration::prepareProcess(Utils::Process &process)
rcPath.copyFile(tmpRc); rcPath.copyFile(tmpRc);
env.set("CLINK_HISTORY_LABEL", "QtCreator"); env.set("CLINK_HISTORY_LABEL", "QtCreator");
env.appendOrSet("CLINK_PATH", tmpRc.parentDir().nativePath(), ";"); env.appendOrSet("CLINK_PATH",
tmpRc.parentDir().nativePath(),
OsSpecificAspects::pathListSeparator(env.osType()));
} else if (cmd.executable().baseName() == "fish") { } else if (cmd.executable().baseName() == "fish") {
FilePath xdgDir = FilePath::fromUserInput(m_tempDir.filePath("fish_xdg_data")); FilePath xdgDir = FilePath::fromUserInput(m_tempDir.filePath("fish_xdg_data"));
FilePath subDir = xdgDir.resolvePath(QString("fish/vendor_conf.d")); FilePath subDir = xdgDir.resolvePath(QString("fish/vendor_conf.d"));
QTC_ASSERT(subDir.createDir(), return); QTC_ASSERT(subDir.createDir(), return);
filesToCopy.fish.script.copyFile(subDir.resolvePath(filesToCopy.fish.script.fileName())); filesToCopy.fish.script.copyFile(subDir.resolvePath(filesToCopy.fish.script.fileName()));
env.appendOrSet("XDG_DATA_DIRS", xdgDir.toUserOutput()); env.appendOrSet("XDG_DATA_DIRS",
xdgDir.toUserOutput(),
OsSpecificAspects::pathListSeparator(env.osType()));
} }
process.setCommand(cmd); process.setCommand(cmd);