From 361b5e35306d3f3f5cf488a67560523d4e1e6cf0 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 23 Sep 2020 12:49:38 +0200 Subject: [PATCH] Utils: Determine shell from $SHELL instead of hard-coding /bin/sh Fixes: QTCREATORBUG-24659 Change-Id: Icafc001b681cc76af76b8759a4de84db51146fd4 Reviewed-by: Christian Stenger Reviewed-by: Eike Ziller Reviewed-by: Christian Kandeler --- src/libs/utils/consoleprocess.cpp | 2 +- src/libs/utils/qtcprocess.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 0edcd131638..25e30214e18 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -516,7 +516,7 @@ bool ConsoleProcess::start() " is currently not supported.")); return false; } - pcmd = QLatin1String("/bin/sh"); + pcmd = qEnvironmentVariable("SHELL", "/bin/sh"); pargs = QtcProcess::Arguments::createUnixArgs( {"-c", (QtcProcess::quoteArg(d->m_commandLine.executable().toString()) + ' ' + d->m_commandLine.arguments())}); diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 15568d602eb..b9696524c8f 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -663,7 +663,7 @@ bool QtcProcess::prepareCommand(const QString &command, const QString &arguments } else { if (err != QtcProcess::FoundMeta) return false; - *outCmd = QLatin1String("/bin/sh"); + *outCmd = qEnvironmentVariable("SHELL", "/bin/sh"); *outArgs = Arguments::createUnixArgs( QStringList({"-c", (quoteArg(command) + ' ' + arguments)})); }