mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Support environment variables in WinRAR path

Browse source
This commit is contained in:
Alexander Koblov 2015-09-05 09:21:53 +00:00
commit 625e3be5da
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/wcx/unrar/src/rarconfdlg.pas
View file

@ -13,11 +13,11 @@ procedure CreateRarConfDlg;
var
Args: String;
WinRar: String;
Method: Integer;
Recovery: Boolean;
Encrypt: Boolean;
Solid: Boolean;
WinRar: String = '%ProgramFiles%\WinRAR\WinRAR.exe';
implementation
@ -34,7 +34,7 @@ begin
gIni:= TIniFile.Create(IniFileName);
try
Args:= gIni.ReadString('unrar', 'Args', EmptyStr);
WinRar:= gIni.ReadString('unrar', 'Path', EmptyStr);
WinRar:= gIni.ReadString('unrar', 'Path', WinRar);
Method:= gIni.ReadInteger('unrar', 'Method', 3);
Recovery:= gIni.ReadBool('unrar', 'Recovery', False);
Encrypt:= gIni.ReadBool('unrar', 'Encrypt', False);

6
plugins/wcx/unrar/src/rarfunc.pas
View file

@ -41,7 +41,7 @@ var
implementation
uses
Process, DCProcessUtf8, UnRARFunc, RarConfDlg;
Process, DCProcessUtf8, DCOSUtils, UnRARFunc, RarConfDlg;
const
UTF16LEBOM: WideChar = #$FEFF;
@ -110,7 +110,7 @@ var
begin
Process := TProcessUtf8.Create(nil);
try
Process.Executable:= WinRar;
Process.Executable:= mbExpandEnvironmentStrings(WinRar);
Process.Parameters.Add('d');
Process.Parameters.Add('-c-');
Process.Parameters.Add('-r-');
@ -156,7 +156,7 @@ var
begin
Process := TProcessUtf8.Create(nil);
try
Process.Executable:= WinRar;
Process.Executable:= mbExpandEnvironmentStrings(WinRar);
if (Flags and PK_PACK_MOVE_FILES <> 0) then
Process.Parameters.Add('m')
else begin