PageAndHiddenSectionStartMenu.nsh PagePreviousInstall.nsh ioPreviousInstall.ini @@ -13,7 +13,7 @@ var currentShell var hasStartedLS var username var whereprofiles -var PreReqOK +var abortWarning var advancedInstall ;-------------------------------- @@ -65,6 +65,7 @@ ReserveFile "ioEvars.ini" ReserveFile "ioEvars2.ini" ReserveFile "ioHowLS.ini" ReserveFile "ioWhereProfiles.ini" +ReserveFile "ioPreviousInstall.ini" ReserveFile "ioFileAssoc.ini" ReserveFile "ioPreReq.ini" ReserveFile "test.txt" @@ -111,15 +112,15 @@ ShowUnInstDetails show !include PageLicense.nsh !include PagePrerequisites.nsh !include PageTypeOfInstall.nsh -!include PageStartMenu.nsh +!include PageDirectory.nsh +!include PagePreviousInstall.nsh !include SectionCore.nsh !include SectionTheme.nsh !include SectionLOSI.nsh -!include HiddenSectionAdditionalIcons.nsh -!include PageDirectory.nsh !include PageHowLS.nsh !include PageWhereProfiles.nsh !include PageInstFiles.nsh +!include PageAndHiddenSectionStartMenu.nsh !include PageAndSectionConfigEvars.nsh !include PageAndSectionFileAssoc.nsh !include PageFinish.nsh @@ -131,15 +132,15 @@ ShowUnInstDetails show !include "LanguageStrings.nsh" Function .onInit - StrCpy $PreReqOK "true" - !ifndef PAGE_WHERE_PROFILES - StrCpy $whereprofiles "default" - !endif + StrCpy $abortWarning "true" + StrCpy $advancedInstall "true" UserInfo::GetName Pop $username ClearErrors ; UserInfo might genrate an error, but we don't care - + + StrCpy $whereprofiles "$PROGRAMFILES\LiteStep\Profiles\$username" + !insertmacro MUI_LANGDLL_DISPLAY ;Always prepare the log within the .onInit function @@ -147,6 +148,7 @@ Function .onInit ;Extract InstallOptions INI Files !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioPreReq.ini" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioPreviousInstall.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioTypeOfInstall.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioHowLS.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioWhereProfiles.ini" @@ -161,10 +163,10 @@ Function .onInstSuccess FunctionEnd Function customOnUserAbort - StrCmp $PreReqOK "false" NoCancelAbort - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(ABORT_WARNING)" IDYES NoCancelAbort + StrCmp $abortWarning "false" NoAbortWarning + MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(ABORT_WARNING)" IDYES NoAbortWarning Abort ; causes installer to not quit. - NoCancelAbort: + NoAbortWarning: FunctionEnd !ifdef WRITE_UNINSTALLER LOSI.nsi @@ -231,4 +231,10 @@ ls.com is down for an unknown period of time I started this changelog instead Fixed a bug in SectionTheme. It would overwrite an existing themeslist.rc and themeselect.rc. Now it keeps the users own themeslist.rc and themeselect.rc files and only installs the - InstDef theme. \ No newline at end of file + InstDef theme. + Moved the page where you select the Start menu folder. + Changed the variable name used for determining if there should be + a warning when canceling the intallation or not. + Added a new page that warns the user if he/she is trying to install + LiteStep when there already is some version of LiteStep installed + to the computer. \ No newline at end of file LS/losi/changelog.txt @@ -29,6 +29,8 @@ LangString TEXT_IO_TITLE_TYPEOFINSTALL ${LANG_ENLISH} "Setup Type" LangString TEXT_IO_TYPEOFINSTALL ${LANG_ENGLISH} "Choose the type of setup you prefer, then click Next" LangString TEXT_IO_TITLE_PREREQ ${LANG_ENGLISH} "Prerequisites" LangString TEXT_IO_PREREQ ${LANG_ENGLISH} "Make sure all prerequisites are met before continuing." +LangString TEXT_IO_TITLE_PREVINST ${LANG_ENGLISH} "A previous installation of LiteStep was found" +LangString TEXT_IO_PREVINST ${LANG_ENGLISH} "You might want to uninstall it." LangString TEXT_REBOOT ${LANG_ENGLISH} "To complete the installation the computer needs to be rebooted.\r\nThis is needed because the operating system needs to read the new registry settings." LangString TEXT_LOGOFF ${LANG_ENGLISH} "To complete the installation you need to log off the computer, and then log in again with the same user.\r\nThis is needed because the operating system needs to read the new registry settings." LangString INSTALL_NORMAL ${LANG_ENGLISH} "Standard - LiteStep will be installed with the most common options." @@ -73,6 +75,8 @@ LangString MB_FOUND_LS_UNINST ${LANG_ENGLISH} "LiteStep should now be killed so LangString FINISH_LOGOFF ${LANG_ENGLISH} "I want to log off" LangString BAD_INST_PATH ${LANG_ENGLISH} "The specified install path is invalid!" LangString ABORT_WARNING ${LANG_ENGLISH} "Are you sure you want to quit the $(^Name) setup?" +LangString PREVINST_TEXT ${LANG_ENGLISH} "It seems like LiteStep is already installed on your computer. If this is an upgrade you should choose to install to the same location the old LiteStep was installed to. Otherwise, please uninstall your current LiteStep installation and then run this installer again." +LangString PREVINST_CHECKBOX ${LANG_ENGLISH} "Continue installing to the specified location ($INSTDIR)" ;Swedish LangString NAME_SecCore ${LANG_SWEDISH} "LiteStepfiler" @@ -97,6 +101,8 @@ LangString TEXT_IO_TITLE_TYPEOFINSTALL ${LANG_SWEDISH} "Typ av installation" LangString TEXT_IO_TYPEOFINSTALL ${LANG_SWEDISH} "Välj om du vill göra en vanlig eller avancerad installation" LangString TEXT_IO_TITLE_PREREQ ${LANG_SWEDISH} "Program som måste vara installerade" LangString TEXT_IO_PREREQ ${LANG_SWEDISH} "Se till att alla program i listan är installerade innan du fortsätter." +LangString TEXT_IO_TITLE_PREVINST ${LANG_SWEDISH} "A previous installation of LiteStep was found" +LangString TEXT_IO_PREVINST ${LANG_SWEDISH} "You might want to uninstall it." LangString TEXT_REBOOT ${LANG_SWEDISH} "För att slutföra installationen behöver datorn startas om.\r\nDetta för att datorn ska läsa in ändringarna till registret." LangString TEXT_LOGOFF ${LANG_SWEDISH} "För att slutföra installationen behöver du logga ut, och sen logga in med samma användare igen.\r\nDetta för att datorn ska läsa in ändringarna till registret." LangString INSTALL_NORMAL ${LANG_SWEDISH} "Normal Installation - Största delen av installationen kommer att gå automatiskt" @@ -141,6 +147,8 @@ LangString MB_FOUND_LS_UNINST ${LANG_SWEDISH} "LiteStep ska nu vara avst LangString FINISH_LOGOFF ${LANG_SWEDISH} "Jag vill logga ut" LangString BAD_INST_PATH ${LANG_SWEDISH} "Ogiltig installationssökväg!" LangString ABORT_WARNING ${LANG_SWEDISH} "Är du säker på att du vill avbryta installationen av $(^Name)?" +LangString PREVINST_TEXT ${LANG_SWEDISH} "Det verkar som att LiteStep redan är installerat på datorn. Om du önskar uppdatera din befintliga LiteStep-installation ska du installera till den plats du redan har LiteStep på. Om du inte ska uppdatera rekomenderas du att avinstallera din befintliga LiteStep-installation och sen köra den här installeraren igen." +LangString PREVINST_CHECKBOX ${LANG_SWEDISH} "Fortsätt installera till den angivna platsen ($INSTDIR)" ;French LangString NAME_SecCore ${LANG_FRENCH} "LiteStep files" @@ -165,6 +173,8 @@ LangString TEXT_IO_TITLE_TYPEOFINSTALL ${LANG_FRENCH} "Type d'installation" LangString TEXT_IO_TYPEOFINSTALL ${LANG_FRENCH} "Choisissez votre type d'installation et cliquez sur <Suivant>." LangString TEXT_IO_TITLE_PREREQ ${LANG_FRENCH} "Conditions requises" LangString TEXT_IO_PREREQ ${LANG_FRENCH} "Soyez sûr de vérifier les conditions requises avant de continuer." +LangString TEXT_IO_TITLE_PREVINST ${LANG_FRENCH} "A previous installation of LiteStep was found" +LangString TEXT_IO_PREVINST ${LANG_FRENCH} "You might want to uninstall it." LangString INSTALL_NORMAL ${LANG_FRENCH} "Standard - LiteStep sera installé avec les options les plus courantes." LangString INSTALL_ADVANCED ${LANG_FRENCH} "Personnalisé - Choisir les options à installer. Recommandé pour les utilisateurs avertis." LangString PRE_REQ_NEEDED ${LANG_FRENCH} "Les éléments suivants doivent être installés sur votre système avant d'installer $(^Name)" @@ -209,6 +219,8 @@ LangString MB_FOUND_LS_UNINST ${LANG_FRENCH} "Litestep va maintenant LangString FINISH_LOGOFF ${LANG_FRENCH} "Je désire fermer la session." LangString BAD_INST_PATH ${LANG_FRENCH} "Install path invalid!" LangString ABORT_WARNING ${LANG_FRENCH} "Êtes-vous sûr de vouloir quitter l'installation de $(^Name) ?" +LangString PREVINST_TEXT ${LANG_FRENCH} "It seems like LiteStep is already installed on your computer. If this is an upgrade you should choose to install to the same location the old LiteStep was installed to. Otherwise, please uninstall your current LiteStep installation and then run this installer again." +LangString PREVINST_CHECKBOX ${LANG_FRENCH} "Continue installing to the specified location ($INSTDIR)" ;German LangString NAME_SecCore ${LANG_GERMAN} "LiteStep Dateien" @@ -233,6 +245,8 @@ LangString TEXT_IO_TITLE_TYPEOFINSTALL ${LANG_GERMAN} "Installationsart" LangString TEXT_IO_TYPEOFINSTALL ${LANG_GERMAN} "Bitte wählen Sie eine Installationsart, klicken Sie dann auf Weiter" LangString TEXT_IO_TITLE_PREREQ ${LANG_GERMAN} "Vorraussetzungen" LangString TEXT_IO_PREREQ ${LANG_GERMAN} "Bitte stellen Sie bevor sie fortfahren fest, dass all diese Vorraussetzungen erfüllt sind." +LangString TEXT_IO_TITLE_PREVINST ${LANG_GERMAN} "A previous installation of LiteStep was found" +LangString TEXT_IO_PREVINST ${LANG_GERMAN} "You might want to uninstall it." LangString TEXT_REBOOT ${LANG_GERMAN} "Starten Sie den Computer neu um die Installation abzuschließen damit das Betriebssystem die Registryeinstellungen übernimmt" LangString TEXT_LOGOFF ${LANG_GERMAN} "Melden Sie sich ab um die Installation abzuschließen damit das Betriebssystem die Registryeinstellungen übernimmt" LangString INSTALL_NORMAL ${LANG_GERMAN} "Standard - Litestep wird mit den am häufigsten verwendeten Optionen installiert" @@ -268,7 +282,7 @@ LangString UNLOG_HEADER ${LANG_GERMAN} "=========== Deinstallationsprotokoll. Bi LangString UNLOG_DAT_NOT_FOUND ${LANG_GERMAN} "${UNINST_DAT} wurde nicht gefunden, Deinstalaltion nicht möglich" LangString UNLOG_DEL_FILE ${LANG_GERMAN} 'Datei "$R9" löschen?' LangString UNLOG_DEL_DIR ${LANG_GERMAN} 'Verzeichnis "$R9" löschen?' -LangString UNLOG_EMPTY_DIR ${LANG_GERMAN} "Vorhergehende Installation in $0 gefunden$\nBenötigte Datei ${UNINSTALL_LOG}.dat fehlt$\nEs wird dringend empfohlen ein leeres Verzeichnis auszuwaehlen und dort neu zu installieren$\n" +LangString UNLOG_EMPTY_DIR ${LANG_GERMAN} "Vorhergehende Installation in $0 gefunden$\nBenötigte Datei ${UNINSTALL_LOG}.dat fehlt$\nEs wird dringend empfohlen ein leeres Verzeichnis auszuwaehlen und dort neu zu installieren$\n" LangString UNLOG_ERROR_LOG ${LANG_GERMAN} "Fehler in Protokoll ${UNINSTALL_LOG}." LangString UNLOG_ERROR_CREATE ${LANG_GERMAN} "Fehler beim erstellen von ${UNINSTALL_LOG}." LangString BACKUP_PERSONAL ${LANG_GERMAN} "Wollen Sie Ihre alten Persönlichen Einstellungen sichern?" @@ -277,3 +291,5 @@ LangString MB_FOUND_LS_UNINST ${LANG_GERMAN} "LiteStep sollte nun beendet werden LangString FINISH_LOGOFF ${LANG_GERMAN} "Abmelden" LangString BAD_INST_PATH ${LANG_GERMAN} "Das gewählte Verzeichnis ist nicht zur Installation geeignet!" LangString ABORT_WARNING ${LANG_GERMAN} "Sind Sie sicher, dass Sie die Installation von $(^Name) abbrechen wollen?" +LangString PREVINST_TEXT ${LANG_GERMAN} "It seems like LiteStep is already installed on your computer. If this is an upgrade you should choose to install to the same location the old LiteStep was installed to. Otherwise, please uninstall your current LiteStep installation and then run this installer again." +LangString PREVINST_CHECKBOX ${LANG_GERMAN} "Continue installing to the specified location ($INSTDIR)" LanguageStrings.nsh @@ -136,7 +136,7 @@ ${OrIf} $R3 == "false" GetDlgItem $R1 $HWNDPARENT 1 EnableWindow $R1 0 - StrCpy $PreReqOK "false" + StrCpy $abortWarning "false" ${EndIf} !insertmacro INSTALLOPTIONS_SHOW PagePrerequisites.nsh @@ -1,118 +1,118 @@ !ifndef SECTION_CORE !define SECTION_CORE !include GetInQuotes.nsh - !include IndexOf.nsh - !include GetExecutablePath.nsh - !include BackupPersonal.nsh - !include Shell9x.nsh + !include IndexOf.nsh + !include GetExecutablePath.nsh + !include BackupPersonal.nsh + !include Shell9x.nsh !include ShellNT.nsh !include GetWindowsVersion.nsh !include SectionsInclude.nsh - + Section "$(NAME_SecCore)" SecCore Push "$INSTDIR" Call KillLS Pop $R9 - + SetOutPath "$SYSDIR" SetOverwrite off - + File ".\msvcp60.dll" File ".\msvcrt.dll" File ".\msvcp70.dll" File ".\msvcp71.dll" File ".\msvcr71.dll" File ".\msvcr70.dll" - + SetOverwrite on SetOutPath "$INSTDIR" - + Push $0 ReadINIStr $0 "$PLUGINSDIR\ioWhereProfiles.ini" "Field 4" "State" ;Field 4 is Documents and Settings IntCmp $0 1 +3 0 0 ReadINIStr $0 "$PLUGINSDIR\ioWhereProfiles.ini" "Field 3" "State" ;Field 3 is LSDir\Profiles IntCmp $0 1 profiles noprofiles - - ; Install to Documents and Settings - StrCpy $whereprofiles "$APPDATA\LiteStep" - !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File ".\LS\step-das\step.rc" ;das = Documents and Settings :p - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - GoTo reg - - ; Install to LSDir\Profiles - profiles: - UserInfo::GetName - Pop $username - StrCmp $username "" +1 profilesok - - ; If we get here it means no username was found, probably due to installing on 9x when not logged in - MessageBox MB_OK $(MB_NO_USER) - GoTo noprofiles - - profilesok: - StrCpy $whereprofiles "$INSTDIR\Profiles\$username" - !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File ".\LS\step-lsdir\step.rc" - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - GoTo reg - - ; Don't install any profiles - noprofiles: - StrCpy $whereprofiles "$INSTDIR" - !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File ".\LS\step-none\step.rc" - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - + + ; Install to Documents and Settings + StrCpy $whereprofiles "$APPDATA\LiteStep" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File ".\LS\step-das\step.rc" ;das = Documents and Settings :p + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + GoTo reg + + ; Install to LSDir\Profiles + profiles: + UserInfo::GetName + Pop $username + StrCmp $username "" +1 profilesok + + ; If we get here it means no username was found, probably due to installing on 9x when not logged in + MessageBox MB_OK $(MB_NO_USER) + GoTo noprofiles + + profilesok: + StrCpy $whereprofiles "$INSTDIR\Profiles\$username" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File ".\LS\step-lsdir\step.rc" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + GoTo reg + + ; Don't install any profiles + noprofiles: + StrCpy $whereprofiles "$INSTDIR" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File ".\LS\step-none\step.rc" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + reg: - Pop $0 - - ;; Store a few paths in the registry - WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "LitestepDir" $INSTDIR + Pop $0 + + ;; Store a few paths in the registry + WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "LitestepDir" $INSTDIR ; IF StrCmp $whereprofiles "$INSTDIR\Profiles\$username" 0 +3 - WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" "$INSTDIR\Profiles\%USERNAME%" - GoTo +5 + WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" "$INSTDIR\Profiles\%USERNAME%" + GoTo +5 ; ELSE IF StrCmp $whereprofiles "$APPDATA\LiteStep" 0 +3 - WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" "%APPDATA%\Litestep" - GoTo +2 + WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" "%APPDATA%\Litestep" + GoTo +2 ; ELSE WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" $whereprofiles - WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "PersonalDir" "$whereprofiles\personal" - + WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "PersonalDir" "$whereprofiles\personal" + ; OTS2 Theme files IfFileExists "$whereprofiles\themes\themeslist.rc" 0 AddThemeFiles IfFileExists "$whereprofiles\themes\themeselect.rc" SkipThemeFiles - + AddThemeFiles: SetOutPath "$whereprofiles\themes\" !insertmacro UNINSTALL.LOG_OPEN_INSTALL File /oname=themeselect.rc ".\Personal\themes\themeselect-empty.rc" File /oname=themeslist.rc ".\Personal\themes\themeslist-empty.rc" - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL SkipThemeFiles: - + SetOutPath "$INSTDIR" !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File ".\LS\changes.txt" - File ".\LS\hook.dll" - File ".\LS\libpng13.dll" - File ".\LS\license.txt" - File ".\LS\litestep.exe" - File ".\LS\lsapi.dll" - File ".\LS\readme.txt" - File ".\LS\release_notes.txt" - File ".\LS\zlib1.dll" - File ".\LS\xPaintClass-1.0.dll" - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - - SetOutPath "$INSTDIR\NLM" - SetOverwrite on - !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File ".\LS\NLM\*" - !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - + File ".\LS\changes.txt" + File ".\LS\hook.dll" + File ".\LS\libpng13.dll" + File ".\LS\license.txt" + File ".\LS\litestep.exe" + File ".\LS\lsapi.dll" + File ".\LS\readme.txt" + File ".\LS\release_notes.txt" + File ".\LS\zlib1.dll" + File ".\LS\xPaintClass-1.0.dll" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + + SetOutPath "$INSTDIR\NLM" + SetOverwrite on + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File ".\LS\NLM\*" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + ReadIniStr $0 "system.ini" "boot" "shell" ${ExePath} $0 $0 ${RIndexOf} $R0 $0 '\' ; Macro expands to 4 lines @@ -133,49 +133,39 @@ ; IF StrCmp $currentShell "" 0 +2 StrCpy $currentShell "explorer.exe" - + ReadINIStr $R0 "$PLUGINSDIR\ioHowLS.ini" "Field 4" "State" ;Field 4 is Don't set shell IntCmp $R0 1 doneSetShell ;If we're not setting LS as the shell, we're jumping down ;to doneSetShell - + ; Check whether we're installing on a 9x or NT based system Call GetWindowsVersion Pop $R0 - + StrCmp $R0 "9x" 0 setNTShell - Call setShell9x - GoTo doneSetShell - + Call setShell9x + GoTo doneSetShell + setNTShell: ;If we get to this point we're not installing on a 9x based machine Call setShellNT - + doneSetShell: Pop $0 - - !ifdef PAGE_START_MENU - ; Shortcuts - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - ;CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${PRODUCT_NAME}.lnk" "$INSTDIR\litestep.exe" - ;CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\litestep.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Set Explorer as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" explorer' "$INSTDIR\losi\SetShellExplorer.ico" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Set LiteStep as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" litestep' "$INSTDIR\losi\SetShellLS.ico" - CreateShortCut "$DESKTOP\Set Explorer as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" explorer' "$INSTDIR\losi\SetShellExplorer.ico" - CreateShortCut "$DESKTOP\Set LiteStep as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" litestep' "$INSTDIR\losi\SetShellLS.ico" - !insertmacro MUI_STARTMENU_WRITE_END - !endif - + + CreateShortCut "$DESKTOP\Set Explorer as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" explorer' "$INSTDIR\losi\SetShellExplorer.ico" + CreateShortCut "$DESKTOP\Set LiteStep as Shell.lnk" '"$INSTDIR\utilities\wxlua.exe"' '"$INSTDIR\utilities\LOSS.lua" litestep' "$INSTDIR\losi\SetShellLS.ico" + SetOverwrite on - + ; Install all the modules and their docs SetOutPath "$INSTDIR\modules\" !insertmacro UNINSTALL.LOG_OPEN_INSTALL File /r /x ".svn" ".\LS\modules\*" !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - + call backupPersonal - + ; Install the personal files SetOutPath "$whereprofiles\personal" ; Don't log these files, they are removed the traditional way @@ -183,8 +173,8 @@ File /r /x ".svn" ".\Personal\personal\*" StrCmp $R9 "LSKilled" 0 wasntRunning - ExecShell open "$INSTDIR\litestep.exe" ;Launch LiteStep - StrCpy $hasStartedLS "true" + ExecShell open "$INSTDIR\litestep.exe" ;Launch LiteStep + StrCpy $hasStartedLS "true" wasntRunning: SectionEnd !endif SectionCore.nsh @@ -101,7 +101,9 @@ ReadRegStr $whereprofiles HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" ExpandEnvStrings $whereprofiles $whereprofiles - Delete "$INSTDIR\${PRODUCT_NAME}.url" + Delete "$INSTDIR\${PRODUCT_NAME}.url" + Delete "$DESKTOP\Set Explorer as Shell.lnk" + Delete "$DESKTOP\Set LiteStep as Shell.lnk" !ifdef PAGE_START_MENU !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP @@ -110,8 +112,6 @@ Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" Delete "$SMPROGRAMS\$ICONS_GROUP\Set Explorer as Shell.lnk" Delete "$SMPROGRAMS\$ICONS_GROUP\Set LiteStep as Shell.lnk" - Delete "$DESKTOP\Set Explorer as Shell.lnk" - Delete "$DESKTOP\Set LiteStep as Shell.lnk" RMDir /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" Uninstaller.nsh HiddenSectionAdditionalIcons.nsh PageStartMenu.nsh d87ef899d9323e8bc24b23e2dd2cce38821e8c2c Tobbe Lundberg tobbesweden@gmail.com http://github.com/Tobbe/losi/commit/b487f7faf134a967b7d6409f75202baa1b34cc2f b487f7faf134a967b7d6409f75202baa1b34cc2f 2008-06-14T14:46:45-07:00 2008-06-14T14:46:45-07:00 Moved the page where you select the Start menu folder. Changed the variable name used for determining if there should be a warning when canceling the intallation or not. Added a new page that warns the user if he/she is trying to install LiteStep when there already is some version of LiteStep installed to the computer. 376df9ccc0a9e4ce509bfcdca3d5c10e5c1ba582 Tobbe Lundberg tobbesweden@gmail.com