Fix enviornment variable setting and paths

This will:
+ Make CEDEV a global system variable
+ Prepend rather than append to the path
+ Allow for spaces in the path automatically

Author: mateoconlechuga

tools/installer/installer.nsi

@@ -21,16 +21,15 @@
 ;--------------------------------
 ;Interface and defines
 
+  !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
   !define env_hkcu 'HKCU "Environment"'
   !define MUI_ABORTWARNING
   !define MUI_ICON "icon.ico"
 
 ;--------------------------------
 ;Pages
 
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE "DirectoryLeave"
   !insertmacro MUI_PAGE_DIRECTORY
-  
   !insertmacro MUI_PAGE_INSTFILES
 
 ;--------------------------------
@@ -44,61 +43,23 @@
 Section ""
 
   SetOutPath "$INSTDIR"
-  
-  File /r ${DIST_PATH}\*.*
-  
-  ReadRegStr $R1 ${env_hkcu} "CEDEV"
-  ${EnvVarUpdate} $0 "PATH" "R" "HKLM" "$R1\bin"
 
-  ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
-
-  WriteRegExpandStr ${env_hkcu} "CEDEV" "$INSTDIR"
-  
-  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
-
-SectionEnd
+  GetFullPathName /SHORT $0 $INSTDIR
+  StrCpy $INSTDIR $0
 
-;--------------------------------
-;Check for spaces
+  File /r ${DIST_PATH}\*.*
 
-Function DirectoryLeave
+  DeleteRegValue ${env_hkcu} "CEDEV"
+  ReadRegStr $R1 ${env_hklm} "CEDEV"
 
-  Push $INSTDIR
-   Call CheckForSpaces
-  Pop $R0
-  StrCmp $R0 0 NoSpaces
+  ${EnvVarUpdate} $0 "PATH" "R" "HKLM" "$R1\bin"
+  ${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$INSTDIR\bin"
 
-  MessageBox MB_OK|MB_ICONEXCLAMATION "Error: The Installaton directory \
-  contains a space character.$\nPlease ensure no spaces are in the path before installing."
-  Abort
+  WriteRegExpandStr ${env_hklm} "CEDEV" "$INSTDIR"
 
-  NoSpaces:
-  
-FunctionEnd
+  SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 
-Function CheckForSpaces
-
- Exch $R0
- Push $R1
- Push $R2
- Push $R3
- StrCpy $R1 -1
- StrCpy $R3 $R0
- StrCpy $R0 0
- loop:
-   StrCpy $R2 $R3 1 $R1
-   IntOp $R1 $R1 - 1
-   StrCmp $R2 "" done
-   StrCmp $R2 " " 0 loop
-   IntOp $R0 $R0 + 1
- Goto loop
- done:
- Pop $R3
- Pop $R2
- Pop $R1
- Exch $R0
- 
-FunctionEnd
+SectionEnd
 
 ;--------------------------------
 ; Find system drive