Skip to content

Commit

Permalink
Fix pak0.pak file check bug. Fix install.log bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
niclaslindstedt committed Oct 17, 2013
1 parent 26d893f commit efe086e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
nquake26_installer.exe
*.exe
changelog.txt
7 changes: 4 additions & 3 deletions nquake-installer_source.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Section "nQuake" NQUAKE
StrCpy $R0 "$DISTFILES_PATH"
${EndIf}
${GetSize} $R0 "/M=pak0.pak /S=0B /G=0" $7 $8 $9
${If} $7 == "18278619"
${If} $7 == "18689235"
CreateDirectory "$INSTDIR\id1"
${Unless} ${FileExists} "$INSTDIR\id1\pak0.pak"
CopyFiles /SILENT "$R0\pak0.pak" "$INSTDIR\id1\pak0.pak"
Expand All @@ -284,6 +284,7 @@ Section "nQuake" NQUAKE
${EndUnless}
Delete "$DISTFILES_PATH\qsw106.zip"
${EndIf}
FileWrite $INSTLOG "id1\pak0.pak$\r$\n"
Goto SkipShareware
${EndIf}
!insertmacro InstallSection qsw106.zip "Quake shareware"
Expand Down Expand Up @@ -322,7 +323,6 @@ Section "nQuake" NQUAKE
IntOp $0 $INSTALLED * 100
IntOp $0 $0 / $INSTSIZE
RealProgress::SetProgress /NOUNLOAD $0
FileWrite $INSTLOG "id1\pak0.pak$\r$\n"

# Backup old configs if such exist
${If} ${FileExists} "$INSTDIR\ezquake\configs\config.cfg"
Expand Down Expand Up @@ -487,6 +487,7 @@ Section "" # Clean up installation
${time::GetFileTime} "$INSTDIR\install.log" $0 $1 $2
FileWrite $INSTLOG "Install date: $1$\r$\n"
FileOpen $R0 $INSTLOGTMP r
ClearErrors
${DoUntil} ${Errors}
FileRead $R0 $0
StrCpy $0 $0 -2
Expand Down Expand Up @@ -809,7 +810,7 @@ Function SetSize
StrCpy $R0 "$DISTFILES_PATH"
${EndIf}
${GetSize} $R0 "/M=pak0.pak /S=0B /G=0" $7 $8 $9
${If} $7 == "18278619"
${If} $7 == "18689235"
Goto SkipShareware
${EndIf}
${EndUnless}
Expand Down

0 comments on commit efe086e

Please sign in to comment.