Merge branch 'v2.1.0-rc-develop' of ssh://git.fifthgrid.com:3022/blockstorage/repertory into v2.1.0-rc-develop
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good

This commit is contained in:
2025-07-30 11:26:22 -05:00
3 changed files with 9 additions and 6 deletions

View File

@@ -248,4 +248,4 @@ wsign-conversion
wunused wunused
wuseless wuseless
wxwidgets_version wxwidgets_version
xattr xattr

View File

@@ -11,6 +11,7 @@
### Changes from v2.0.6-release ### Changes from v2.0.6-release
* Fixed `.` and `..` incorrectly being reported as files in remote Linux mounts * Fixed `.` and `..` incorrectly being reported as files in remote Linux mounts
* Fixed UI mount failure when path contains a space
## v2.0.6-release ## v2.0.6-release

View File

@@ -32,16 +32,18 @@ WizardStyle=modern
function CheckAddPath(Param: string): boolean; function CheckAddPath(Param: string): boolean;
var var
CurPath: string; CurPath: string;
PathPos: Integer;
begin begin
if not RegQueryStringValue(HKEY_LOCAL_MACHINE, if RegQueryStringValue(HKEY_LOCAL_MACHINE,
'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
'Path', CurPath) 'PATH', CurPath)
then begin then begin
Result := True; PathPos := Pos(';' + Param + ';', ';' + CurPath + ';');
Result := PathPos = 0;
exit; exit;
end; end;
Result := Pos(';' + Param + ';', ';' + CurPath + ';') = 0; Result := True;
end; end;
[Languages] [Languages]
@@ -66,4 +68,4 @@ Filename: "msiexec.exe"; WorkingDir: "{app}"; Parameters: "/a winfsp-@WINFSP_VER
[Registry] [Registry]
Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \
ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app};"; \ ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app};"; \
Check: CheckAddPath('{app}') Check: CheckAddPath(ExpandConstant('{app}'))