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

RemoteLinux: Disable sourcing /etc/profile and ~/.profile by default

Browse Source 
[ChangeLog][RemoteLinux] Target-side shell profiles are not sourced by
default anymore.

Change-Id: Ide5029d02a0d149c4e532ee523f1dd49e7080c7b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2023-03-16 10:30:46 +01:00
parent dea3ea2262
commit 024897521c
5 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -464,6 +464,11 @@ bool SshProcessInterface::runInShell(const CommandLine &command, const QByteArra
return isFinished;
}
IDevice::ConstPtr SshProcessInterface::device() const
{
return d->m_device;
}
void SshProcessInterface::start()
{
d->start();
@@ -520,7 +525,7 @@ QString LinuxProcessInterface::fullCommandLine(const CommandLine &commandLine) c
{
CommandLine cmd;
if (!commandLine.isEmpty()) {
if (!commandLine.isEmpty() && device()->extraData(Constants::SourceProfile).toBool()) {
const QStringList rcFilesToSource = {"/etc/profile", "$HOME/.profile"};
for (const QString &filePath : rcFilesToSource) {
cmd.addArgs({"test", "-f", filePath});
@@ -730,6 +735,7 @@ void SshProcessInterfacePrivate::doStart()
env.set("DISPLAY", m_sshParameters.x11DisplayName);
m_process.setControlEnvironment(env);
}
m_process.setExtraData(q->m_setup.m_extraData);
m_process.setCommand(fullLocalCommandLine());
m_process.start();
}