Skip to content

Commit

Permalink
remove NSIS_HOME support
Browse files Browse the repository at this point in the history
  • Loading branch information
idleberg committed Nov 25, 2016
1 parent 560f737 commit 820b321
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ Go to your Sublime Text 3 `Packages` directory and clone the repository using th

## Portable NSIS support

Support for portable NSIS can be achieved by putting the main NSIS program directory path in the `PATH` [environment variable](http://superuser.com/questions/284342/what-are-path-and-other-environment-variables-and-how-can-i-set-or-use-them/284351#284351).
Support for portable NSIS can be achieved by putting the main NSIS program directory path in your `PATH` [environment variable](http://superuser.com/questions/284342/what-are-path-and-other-environment-variables-and-how-can-i-set-or-use-them/284351#284351).
13 changes: 2 additions & 11 deletions scripts/build.cmd
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
@echo off

set nsis_compiler=

if defined NSIS_HOME (
if exist "%NSIS_HOME%\makensis.exe" (
set "nsis_compiler=%NSIS_HOME%"
)
)

if %PROCESSOR_ARCHITECTURE%==x86 (
set RegQry=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NSIS
) else (
set RegQry=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\NSIS
)

if not defined nsis_compiler (
for /F "tokens=2*" %%a in ('reg query "%RegQry%" /v InstallLocation ^|findstr InstallLocation') do set nsis_compiler=%%b
)
for /F "tokens=2*" %%a in ('reg query "%RegQry%" /v InstallLocation ^|findstr InstallLocation') do set nsis_compiler=%%b

if not defined nsis_compiler (
for %%X in (makensis.exe) do (set nsis_compiler=%%~dp$PATH:X)
Expand All @@ -31,5 +22,5 @@ if not "%~1"=="" goto loop
if defined nsis_compiler (
"%nsis_compiler%\makensis.exe" %args%
) else (
echo "Error, build system cannot find NSIS! Please reinstall it, add makensis.exe to your PATH, or defined the NSIS_HOME environment variable."
echo "Error, build system cannot find NSIS! Make sure it's installed and makensis.exe is in your PATH environment variable."
)

1 comment on commit 820b321

@idleberg
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know where this came from, but NSIS_HOME has never been an environmental variable used by NSIS. It might have been used by the unofficial Unicode fork in the past, but that has been deprecated in favour of NSIS v3.

Please sign in to comment.