[gimp/wip/Jehan/gitlab-ci-win-32-bit: 14/19] build: also looking for HKEY_CURRENT_USER Inno Setup registry key.




commit 815dceacbd79c3f90dcd3cb5241fdcc285687632
Author: Jehan <jehan girinstud io>
Date:   Tue May 11 21:24:59 2021 +0200

    build: also looking for HKEY_CURRENT_USER Inno Setup registry key.
    
    This will allow to use an user-installer Inno Setup, which is nicer,
    especially to install it inside the CI without bothering about admin
    rights.

 build/windows/installer/compile.bat | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/build/windows/installer/compile.bat b/build/windows/installer/compile.bat
index 047f5cd488..5bc1d0f923 100755
--- a/build/windows/installer/compile.bat
+++ b/build/windows/installer/compile.bat
@@ -12,8 +12,10 @@ set DEPS32=%~6
 set DEPS64=%~7
 
 if [%INNOPATH%]==[] (
+FOR /F "usebackq tokens=5,* skip=2" %%A IN (`REG QUERY 
"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App 
Path" /reg:32`) DO set INNOPATH=%%B
+) else (if [%INNOPATH%]==[] (
 FOR /F "usebackq tokens=5,* skip=2" %%A IN (`REG QUERY 
"HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App Path" 
/reg:32`) DO set INNOPATH=%%B
-)
+))
 if not exist "%INNOPATH%\iscc.exe" goto noinno
 
 ::i'd use %*, but shift has no effect on it


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]