[Aqsis-commits] SF.net SVN: aqsis: [1862] trunk/aqsis/distribution/win/nsis/setup.nsi

[<lta...@us...>]

Revision: 1862
          http://aqsis.svn.sourceforge.net/aqsis/?rev=1862&view=rev
Author:   ltatkinson
Date:     2008-01-22 06:06:52 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
Fix Windows (NSIS) installer issue, where the %PATH% variable(s) 'Type' was incorrectly being changed from 'REG_EXPAND_SZ' to 'REG_SZ'.

This should warrant an incremental release (1.2.1) given the nature of this issue!

Modified Paths:
--------------
    trunk/aqsis/distribution/win/nsis/setup.nsi

Modified: trunk/aqsis/distribution/win/nsis/setup.nsi
===================================================================
--- trunk/aqsis/distribution/win/nsis/setup.nsi	2008-01-21 03:29:47 UTC (rev 1861)
+++ trunk/aqsis/distribution/win/nsis/setup.nsi	2008-01-22 14:06:52 UTC (rev 1862)
@@ -289,7 +289,7 @@
   StrCmp $PATH_NT "1" "path_nt" "path_nt_end"
     path_nt:
     ReadRegStr $PATH HKCU "Environment" "PATH"
-    WriteRegStr HKCU "Environment" "PATH" "$PATH;$INSTDIR\bin"
+    WriteRegExpandStr HKCU "Environment" "PATH" "$INSTDIR\bin;$PATH"
     SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
     path_nt_end:
 
@@ -298,7 +298,7 @@
   StrCmp $PATH_NT_ALL "1" "path_nt_all" "path_nt_all_end"
     path_nt_all:
     ReadRegStr $PATH HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH"
-    WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH" "$PATH;$INSTDIR\bin"
+    WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH" "$INSTDIR\bin;$PATH"
     SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
     path_nt_all_end:
 
@@ -411,12 +411,12 @@
   RMDir /r "$INSTDIR"
 
   ReadRegStr $PATH_NT HKCU "Environment" "PATH"
-  ${un.WordReplace} "$PATH_NT" ";$INSTDIR\bin" "" "+" $PATH
-  WriteRegStr HKCU "Environment" "PATH" "$PATH"
+  ${un.WordReplace} "$PATH_NT" "$INSTDIR\bin;" "" "+" $PATH
+  WriteRegExpandStr HKCU "Environment" "PATH" "$PATH"
 
   ReadRegStr $PATH_NT_ALL HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH"
-  ${un.WordReplace} "$PATH_NT_ALL" ";$INSTDIR\bin" "" "+" $PATH
-  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH" "$PATH"
+  ${un.WordReplace} "$PATH_NT_ALL" "$INSTDIR\bin;" "" "+" $PATH
+  WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PATH" "$PATH"
 
   DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "AQSISHOME"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.