[ros-diffs] [dreimer] 27655: Changed back to C:\RosBE as default folder. NonAdmin Account users need to set another one. Tried to simplify WriteEnvStr.nsh a bit.

[dreimer at svn.reactos.org]

Author: dreimer
Date: Sat Jul 14 17:31:45 2007
New Revision: 27655

URL: http://svn.reactos.org/svn/reactos?rev=27655&view=rev
Log:
Changed back to C:\RosBE as default folder. NonAdmin Account users need to set another one.
Tried to simplify WriteEnvStr.nsh a bit.

Modified:
    trunk/tools/RosBE-Windows/RosBE.nsi
    trunk/tools/RosBE-Windows/WriteEnvStr.nsh

Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=27655&r1=27654&r2=27655&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Jul 14 17:31:45 2007
@@ -10,7 +10,7 @@
 ;;
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "RosBE-${PRODUCT_VERSION}.exe"
-InstallDir "$PROFILE\RosBE"
+InstallDir "C:\RosBE"
 InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -252,7 +252,7 @@
         Return
     ${else}
         messageBox MB_OK|MB_ICONEXCLAMATION \
-            "You do not have administrative privileges. Installing on NonAdmin Account is working now, but it's not tested well yet. NO Vista Support possible!"
+            "You do not have administrative privileges. You need to set a folder with writing rights to install your BE and Code to. NO Vista Support possible!"
         Return
     ${EndIf}
 FunctionEnd

Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.nsh?rev=27655&r1=27654&r2=27655&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original)
+++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh Sat Jul 14 17:31:45 2007
@@ -26,7 +26,13 @@
     Call IsNT
     Pop $2
     ${if} $2 == "1"
-        goto WriteEnvStr_NT
+        WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
+        SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+                    0 "STR:Environment" /TIMEOUT=5000
+        Pop $2
+        Pop $0
+        Pop $1
+        Return
     ${endif}
         ; Not on NT
         StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:)
@@ -35,14 +41,6 @@
         FileWrite $2 "$\r$\nSET $0=$1$\r$\n"
         FileClose $2
         SetRebootFlag true
-        Goto WriteEnvStr_done
-
-    WriteEnvStr_NT:
-        WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
-        SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
-                    0 "STR:Environment" /TIMEOUT=5000
-
-    WriteEnvStr_done:
         Pop $2
         Pop $0
         Pop $1
@@ -67,7 +65,16 @@
     Call un.IsNT
     Pop $1
     ${if} $1 == "1"
-        goto DeleteEnvStr_NT
+        DeleteRegValue ${WriteEnvStr_RegKey} $0
+        SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+                    0 "STR:Environment" /TIMEOUT=5000
+        Pop $5
+        Pop $4
+        Pop $3
+        Pop $2
+        Pop $1
+        Pop $0
+        Return
     ${endif}
         ; Not on NT
         StrCpy $1 $WINDIR 2
@@ -97,14 +104,6 @@
         Delete "$1\autoexec.bat"
         CopyFiles /SILENT $4 "$1\autoexec.bat"
         Delete $4
-        Goto DeleteEnvStr_done
-
-    DeleteEnvStr_NT:
-        DeleteRegValue ${WriteEnvStr_RegKey} $0
-        SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
-                    0 "STR:Environment" /TIMEOUT=5000
-
-    DeleteEnvStr_done:
         Pop $5
         Pop $4
         Pop $3