Skip to content

Add environment path management for installation #4514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eduardomozart wants to merge 6 commits into
base: main
Choose a base branch
from
+78 −1
Open

Add environment path management for installation #4514

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fa4da1
Add environment path management for installation
eduardomozart Feb 19, 2026
14b7315
Add section for PATH environment variable configuration
eduardomozart Feb 19, 2026
09a98d6
Merge branch 'main' into patch-3
eduardomozart Feb 20, 2026
469dc34
Apply suggestions from code review (error handling for PATH manipulat…
stweil Feb 21, 2026
a663099
Add EnVar plugin to winsetup dependencies
eduardomozart Feb 21, 2026
8831e0f
Enhance PATH management during installation and uninstallation
eduardomozart Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions nsis/tesseract.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,27 @@ SectionGroup "Additional language data (download)" SecGrp_ALD

SectionGroupEnd

Section /o "Add to PATH environment variable" SecAddEnvPath
; Check if the installer is running in "Current User" mode
StrCmp $MultiUser.InstallMode "CurrentUser" SetUserPath 0

; If "All Users" mode, verify that the current process is actually elevated
UserInfo::GetAccountType
Pop $0
StrCmp $0 "Admin" SetSystemPath SetUserPath

SetSystemPath:
EnVar::SetHKLM
Goto UpdatePath

SetUserPath:
EnVar::SetHKCU

UpdatePath:
EnVar::AddValue "Path" "$INSTDIR"
Pop $0 ; Clean up the stack (returns 0 on success)
Comment thread
eduardomozart marked this conversation as resolved.
Outdated
Comment thread
stweil marked this conversation as resolved.
Outdated
SectionEnd

;--------------------------------
;Descriptions
; At first we need to localize installer for languages which supports well in tesseract: Eng, Spa, Ger, Ita, Dutch + Russian (it is authors native language)
Expand Down Expand Up @@ -1164,6 +1185,7 @@ SectionGroupEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecGrp_LD} $(DESC_SecGrp_LD)
!insertmacro MUI_DESCRIPTION_TEXT ${SecGrp_ASD} $(DESC_SecGrp_ASD)
!insertmacro MUI_DESCRIPTION_TEXT ${SecGrp_ALD} $(DESC_SecGrp_ALD)
!insertmacro MUI_DESCRIPTION_TEXT ${SecAddEnvPath} $(DESC_SecAddEnvPath)
!insertmacro MUI_FUNCTION_DESCRIPTION_END

;--------------------------------
Expand Down Expand Up @@ -1196,6 +1218,24 @@ Section -un.Main UNSEC0000
RMDir "$INSTDIR\doc"
RMDir /r "$INSTDIR\tessdata"
RMDir "$INSTDIR"

# remove from PATH
StrCmp $MultiUser.InstallMode "CurrentUser" UnSetUserPath 0

UserInfo::GetAccountType
Pop $0
StrCmp $0 "Admin" UnSetSystemPath UnSetUserPath

UnSetSystemPath:
EnVar::SetHKLM
Goto RemovePath

UnSetUserPath:
EnVar::SetHKCU

RemovePath:
EnVar::DeleteValue "Path" "$INSTDIR"
Pop $0
Comment thread
eduardomozart marked this conversation as resolved.
Outdated
Comment thread
stweil marked this conversation as resolved.
SectionEnd

Function PageReinstall
Expand Down Expand Up @@ -1433,6 +1473,17 @@ Function .onInit
Vietnamese: !insertmacro SelectSection ${SecLang_vie}

lang_end:

; --- Command Line Parsing ---
${GetParameters} $R0

; Check for "Add to PATH environment variable" flag (case-insensitive)
ClearErrors
${GetOptions} $R0 "/ADDENVPATH" $R1
Comment thread
eduardomozart marked this conversation as resolved.
${IfNot} ${Errors}
!insertmacro SelectSection ${SecAddEnvPath}
${EndIf}
; ----------------------------
FunctionEnd

Function un.onInit
Expand Down