|
|
@@ -74,7 +74,7 @@ Var AR_RegFlags
|
|
|
|
|
|
ClearErrors
|
|
|
;Reading component status from registry
|
|
|
- ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" "Installed"
|
|
|
+ ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
|
|
|
IfErrors "default_${SecName}"
|
|
|
;Status will stay default if registry value not found
|
|
|
;(component was never installed)
|
|
|
@@ -107,13 +107,13 @@ Var AR_RegFlags
|
|
|
;Section is not selected:
|
|
|
;Calling Section uninstall macro and writing zero installed flag
|
|
|
!insertmacro "Remove_${${SecName}}"
|
|
|
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
|
|
|
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
|
|
|
"Installed" 0
|
|
|
Goto "exit_${SecName}"
|
|
|
|
|
|
"leave_${SecName}:"
|
|
|
;Section is selected:
|
|
|
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
|
|
|
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
|
|
|
"Installed" 1
|
|
|
|
|
|
"exit_${SecName}:"
|
|
|
@@ -484,7 +484,7 @@ Function ConditionalAddToRegisty
|
|
|
Pop $0
|
|
|
Pop $1
|
|
|
StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
|
|
|
- WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" \
|
|
|
+ WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
|
|
|
"$1" "$0"
|
|
|
;MessageBox MB_OK "Set Registry: '$1' to '$0'"
|
|
|
DetailPrint "Set install registry entry: '$1' to '$0'"
|
|
|
@@ -794,17 +794,17 @@ FunctionEnd
|
|
|
|
|
|
Section "Uninstall"
|
|
|
ReadRegStr $START_MENU SHCTX \
|
|
|
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "StartMenu"
|
|
|
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
|
|
|
;MessageBox MB_OK "Start menu is in: $START_MENU"
|
|
|
ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
|
|
|
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "DoNotAddToPath"
|
|
|
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
|
|
|
ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
|
|
|
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "AddToPathAllUsers"
|
|
|
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
|
|
|
ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
|
|
|
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "AddToPathCurrentUser"
|
|
|
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
|
|
|
;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
|
|
|
ReadRegStr $INSTALL_DESKTOP SHCTX \
|
|
|
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@" "InstallToDesktop"
|
|
|
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
|
|
|
;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
|
|
|
|
|
|
@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
|
|
|
@@ -821,7 +821,7 @@ Section "Uninstall"
|
|
|
|
|
|
;Remove the uninstaller itself.
|
|
|
Delete "$INSTDIR\Uninstall.exe"
|
|
|
- DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
|
|
|
+ DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
|
|
|
|
|
|
;Remove the installation directory if it is empty.
|
|
|
RMDir "$INSTDIR"
|