etlegacy/etlegacy-tools
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-tools.git synced 2024-11-21 19:41:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed obsolete mp_bin.pk3 requirement

Browse source
This commit is contained in:
Remy Marquis 2014-02-04 20:28:34 +01:00
parent d9d5da6ff0
commit 612c14b7f3
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/etlegacy-linux-full-installer.sh
View file

@ -119,7 +119,7 @@ note i "Installing..."
chmod +x et-linux-2.60.x86.run chmod +x et-linux-2.60.x86.run
./et-linux-2.60.x86.run --noexec --target etlegacy ./et-linux-2.60.x86.run --noexec --target etlegacy
rm -rf etlegacy/{bin,Docs,README,pb,openurl.sh,CHANGES,ET.xpm} etlegacy/setup.{data,sh} etlegacy/etmain/*.cfg rm -rf etlegacy/{bin,Docs,README,pb,openurl.sh,CHANGES,ET.xpm} etlegacy/setup.{data,sh} etlegacy/etmain/{*.cfg,*.so,*.txt,*.dat,mp_bin.pk3}
rm -f etlegacy/legacy/omni-bot/omnibot_et.dll rm -f etlegacy/legacy/omni-bot/omnibot_et.dll
cd etlegacy cd etlegacy

20
nsis/etlegacy.nsi
View file

@ -101,21 +101,12 @@ Section "Wolfenstein: Enemy Territory assets" ASSETS
GOTO COPY_PAK2 GOTO COPY_PAK2
COPY_PAK2: COPY_PAK2:
IfFileExists "$INSTDIR\etmain\pak2.pk3" COPY_MP_BIN IfFileExists "$INSTDIR\etmain\pak2.pk3" END
IfFileExists "$1\etmain\pak2.pk3" 0 +3 IfFileExists "$1\etmain\pak2.pk3" 0 +3
copyfiles "$1\etmain\pak2.pk3" "$INSTDIR\etmain\" copyfiles "$1\etmain\pak2.pk3" "$INSTDIR\etmain\"
GOTO COPY_MP_BIN GOTO END
IfFileExists "$TEMP\etl_install\pak2.pk3" 0 GET_PATCH IfFileExists "$TEMP\etl_install\pak2.pk3" 0 GET_PATCH
copyfiles "$TEMP\etl_install\pak2.pk3" "$INSTDIR\etmain\" copyfiles "$TEMP\etl_install\pak2.pk3" "$INSTDIR\etmain\"
GOTO COPY_MP_BIN
COPY_MP_BIN:
IfFileExists "$INSTDIR\etmain\mp_bin.pk3" END
IfFileExists "$1\etmain\mp_bin.pk3" 0 +3
copyfiles "$1\etmain\mp_bin.pk3" "$INSTDIR\etmain\"
GOTO END
IfFileExists "$TEMP\etl_install\mp_bin.pk3" 0 GET_PATCH
copyfiles "$TEMP\etl_install\mp_bin.pk3" "$INSTDIR\etmain\"
GOTO END GOTO END
GET_INSTALL: GET_INSTALL:
@ -189,13 +180,10 @@ Section "Wolfenstein: Enemy Territory assets" ASSETS
copyfiles "$TEMP\etl_install\pak2.pk3" "$INSTDIR\etmain\" copyfiles "$TEMP\etl_install\pak2.pk3" "$INSTDIR\etmain\"
IfFileExists "$INSTDIR\etmain\pak2.pk3" +2 IfFileExists "$INSTDIR\etmain\pak2.pk3" +2
MessageBox MB_ICONEXCLAMATION|MB_OK "Fatal Error: Copy failed (pak2.pk3)." MessageBox MB_ICONEXCLAMATION|MB_OK "Fatal Error: Copy failed (pak2.pk3)."
copyfiles "$TEMP\etl_install\mp_bin.pk3" "$INSTDIR\etmain\"
IfFileExists "$INSTDIR\etmain\mp_bin.pk3" +2
MessageBox MB_ICONEXCLAMATION|MB_OK "Fatal Error: Copy failed (mp_bin.pk3)."
GOTO END GOTO END
USERCANCEL: USERCANCEL:
Messagebox MB_OK|MB_ICONEXCLAMATION "Make sure to copy W:ET assets files (pak0.pk3, pak1.pk3, pak2.pk3 and mp_bin.pk3) into $INSTDIR\etmain before you run ET:Legacy." Messagebox MB_OK|MB_ICONEXCLAMATION "Make sure to copy W:ET assets files (pak0.pk3, pak1.pk3, pak2.pk3) into $INSTDIR\etmain before you run ET:Legacy."
END: END:
SectionEnd SectionEnd
@ -318,6 +306,6 @@ SectionEND
; Section descriptions ; Section descriptions
!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${UNFILES} "Uninstall Enemy Territory: Legacy and Omni-bot files." !insertmacro MUI_DESCRIPTION_TEXT ${UNFILES} "Uninstall Enemy Territory: Legacy and Omni-bot files."
!insertmacro MUI_DESCRIPTION_TEXT ${UNASSETS} "Uninstall Wolfenstein: Enemy Territory .pk3 assets (pak0.pk3, pak1.pk3, pak2.pk3 and mp_bin.pk3)." !insertmacro MUI_DESCRIPTION_TEXT ${UNASSETS} "Uninstall Wolfenstein: Enemy Territory .pk3 assets (pak0.pk3, pak1.pk3, pak2.pk3)."
!insertmacro MUI_DESCRIPTION_TEXT ${WOLFETL} "Delete ETKEY and all created or downloaded files inside the $DOCUMENTS\ETLegacy folder." !insertmacro MUI_DESCRIPTION_TEXT ${WOLFETL} "Delete ETKEY and all created or downloaded files inside the $DOCUMENTS\ETLegacy folder."
!insertmacro MUI_UNFUNCTION_DESCRIPTION_END !insertmacro MUI_UNFUNCTION_DESCRIPTION_END