Skip to content

Commit

Permalink
Split SecCore into three sections: SecCore, SecProfiles, SecModules.
Browse files Browse the repository at this point in the history
It was necessary to modify PageWhereProfiles and PageHowLS in order to keep their issues fixed as well (Tobbe#20 and Tobbe#33, respectively). This patch fixes issue Tobbe#12.
  • Loading branch information
Darrin C Roenfanz committed Nov 28, 2011
1 parent 4689bc5 commit 8233811
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion PageHowLS.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Page custom ioHowLS

Function ioHowLS
${IfNot} ${SectionIsSelected} ${SecCore}
${IfNot} ${SectionIsSelected} ${SecProfiles}
Abort
${EndIf}
StrCmp $advancedInstall "true" 0 end
Expand Down
2 changes: 1 addition & 1 deletion PageWhereProfiles.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Page custom ioWhereProfiles

Function ioWhereProfiles
${IfNot} ${SectionIsSelected} ${SecCore}
${IfNot} ${SectionIsSelected} ${SecProfiles}
Abort
${EndIf}

Expand Down
28 changes: 17 additions & 11 deletions SectionCore.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
!include WinVer.nsh
!include SectionsInclude.nsh
!include EnumLoginUsers.nsh


SectionGroup "LiteStep Files"
Section "$(NAME_SecCore)" SecCore
${If} ${FileExists} "$INSTDIR\litestep.exe"
Push "$INSTDIR"
Expand Down Expand Up @@ -43,7 +44,9 @@
Pop $username
${EnumLoginUsersArray->Shift} "$username"
${EndIf}

SectionEnd

Section "Profiles" SecProfiles
Push $0
Push $1
Push $2
Expand Down Expand Up @@ -204,14 +207,6 @@
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
Expand All @@ -231,6 +226,17 @@
${If} $R9 == "LSKilled"
ExecShell open "$INSTDIR\litestep.exe" ;Launch LiteStep
StrCpy $hasStartedLS "true"
${EndIf}
${EndIf}
SectionEnd

Section "Modules" SecModules
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
SectionEnd
SectionGroupEnd
!endif

0 comments on commit 8233811

Please sign in to comment.