[ros-diffs] [dreimer] 41950: Fixx0rz. Now the Installer works. (Already made a test RosBE-64)

[dreimer at svn.reactos.org]

Author: dreimer
Date: Tue Jul 14 12:42:37 2009
New Revision: 41950

URL: http://svn.reactos.org/svn/reactos?rev=41950&view=rev
Log:
Fixx0rz. Now the Installer works. (Already made a test RosBE-64)

Modified:
    trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi?rev=41950&r1=41949&r2=41950&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Tue Jul 14 12:42:37 2009
@@ -136,14 +136,14 @@
     SetOverwrite try
     File /r Root\options.cmd
     IfFileExists "$INSTDIR\RosBE.ps1" 0 +3
-        File /r Root\options.ps1
+        File /r Components\Powershell\options.ps1
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
     File /r Components\Tools\options64.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
         SetOutPath $INSTDIR
-        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit.lnk" \
                        "$INSTDIR\Tools\options64.exe"
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
@@ -202,9 +202,9 @@
     ;;
     ;; Clean up installed files.
     ;;
-    RMDir /r /REBOOTOK "$INSTDIR\x86_64"
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
+    RMDir /r /REBOOTOK "$INSTDIR\amd64"
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
     Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
     ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!!
     RMDir /REBOOTOK "$INSTDIR"