dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jehan 2021-05-11 21:24:59 +02:00
parent 3d50cb339c
commit 529eb56477
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/windows/installer/compile.bat
View File

@ -12,8 +12,10 @@ set DEPS32=%~6
set DEPS64=%~7 set DEPS64=%~7
if [%INNOPATH%]==[] ( 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 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 if not exist "%INNOPATH%\iscc.exe" goto noinno
::i'd use %*, but shift has no effect on it ::i'd use %*, but shift has no effect on it