mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-01 11:15:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

konsole -e 'man ls' should work as expected

Browse Source 
BUG: 295648
FIXED-IN: 4.9.0
This commit is contained in:
Jekyll Wu
2012-03-10 12:12:08 +08:00
parent cd090f2d1d
commit aa75fc8fee
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Application.cpp
View File

@@ -38,6 +38,7 @@
#include "SessionManager.h"
#include "MainWindow.h"
#include "Session.h"
#include "ShellCommand.h"
using namespace Konsole;
@@ -375,12 +376,25 @@ Profile::Ptr Application::processProfileChangeArgs(KCmdLineArgs* args, Profile::
// run a custom command
if ( args->isSet("e") ) {
QString commandExec;
QStringList commandArguments;
commandArguments << args->getOption("e");
for ( int i = 0 ; i < args->count() ; i++ )
commandArguments << args->arg(i);
QString commandExec = args->getOption("e");
// Note: KCmdLineArgs::count() return the number of arguments
// that aren't options.
if ( args->count() > 0 ) { // example: konsole -e man ls
commandExec = args->getOption("e");
commandArguments << commandExec;
for ( int i = 0 ; i < args->count() ; i++ )
commandArguments << args->arg(i);
} else { // example: konsole -e "man ls"
ShellCommand shellCommand(args->getOption("e"));
commandExec = shellCommand.command();
commandArguments = shellCommand.arguments();
}
if (commandExec.startsWith(QLatin1String("./")))
commandExec = QDir::currentPath() + commandExec.mid(1);