mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Set process current directory when execute <?..?> command

Browse source
This commit is contained in:
Alexander Koblov 2023-10-21 13:21:39 +03:00
commit 63dd485b34
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/uquickviewpanel.pas
View file

@ -303,7 +303,6 @@ var
sCmd: string = '';
sParams: string = '';
sStartPath: string = '';
bTerm, bKeepTerminalOpen: Boolean;
bAbortOperationFlag: Boolean = False;
bShowCommandLinePriorToExecute: Boolean = False;
begin
@ -316,8 +315,7 @@ begin
ATemp:= AFile.Clone;
try
ATemp.FullPath:= FileName;
sCmd:= PrepareParameter(sCmd, ATemp, [ppoReplaceTilde]);
sParams:= PrepareParameter(sParams, ATemp, [], @bShowCommandLinePriorToExecute, @bTerm, @bKeepTerminalOpen, @bAbortOperationFlag);
sParams:= PrepareParameter(sParams, ATemp, [], @bShowCommandLinePriorToExecute, nil, nil, @bAbortOperationFlag);
finally
ATemp.Free;
end;
@ -332,7 +330,7 @@ begin
else
FTempFileSource:= TTempFileSystemFileSource.GetFileSource;
end;
PrepareOutput(sParams, FTempFileSource.GetRootDir);
PrepareOutput(sParams, sStartPath, FTempFileSource.GetRootDir);
if mbFileExists(sParams) then FileName:= sParams;
end;
end;

9
src/ushellexecute.pas
View file

@ -35,7 +35,7 @@ type
TPrepareParameterOption = (ppoNormalizePathDelims, ppoReplaceTilde);
TPrepareParameterOptions = set of TPrepareParameterOption;
procedure PrepareOutput(var sParams: String; const ATemp: String = '');
procedure PrepareOutput(var sParams: String; const sWorkPath: String; const ATemp: String = '');
function PrepareParameter(sParam: string; paramFile: TFile = nil; options: TPrepareParameterOptions = []; pbShowCommandLinePriorToExecute: PBoolean = nil; pbRunInTerminal: PBoolean = nil; pbKeepTerminalOpen: PBoolean = nil; pbAbortOperation: PBoolean = nil): string; overload;
@ -937,7 +937,7 @@ begin
end;
end;
procedure PrepareOutput(var sParams: String; const ATemp: String);
procedure PrepareOutput(var sParams: String; const sWorkPath: String; const ATemp: String);
var
Process: TProcessUTF8;
iStart, iCount: Integer;
@ -959,6 +959,7 @@ begin
Process := TProcessUTF8.Create(nil);
try
Process.CommandLine := FormatShell(sShellCmdLine);
Process.CurrentDirectory := sWorkPath;
Process.Options := [poWaitOnExit];
Process.ShowWindow := swoHide;
Process.Execute;
@ -1003,9 +1004,9 @@ begin
sParams := PrepareParameter(sParams, paramFile, [], @bShowCommandLinePriorToExecute, @bTerm, @bKeepTerminalOpen, @bAbortOperationFlag);
if not bAbortOperationFlag then sWorkPath := PrepareParameter(sWorkPath, paramFile, [ppoNormalizePathDelims, ppoReplaceTilde]);
// 2. If working directory has been specified, let's switch to it.
if not bAbortOperationFlag then
begin
// 2. If working directory has been specified, let's switch to it.
if sWorkPath <> '' then
mbSetCurrentDir(sWorkPath);
@ -1018,7 +1019,7 @@ begin
// For example:
// {!VIEWER} <?rpm -qivlp --scripts %p?>
// Show in Viewer information about RPM package
PrepareOutput(sParams);
PrepareOutput(sParams, sWorkPath);
//4. If user user wanted to execute an internal command, let's do it.
if frmMain.Commands.Commands.ExecuteCommand(sCmd, [sParams]) = cfrSuccess then