diff --git a/Makefile b/Makefile index eb6b446..356c260 100755 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ ifndef CSGOSL_ROOT $(error CSGOSL_ROOT is not set, source env.sh in root directory) endif +# When just fixing csgosl stuff: make +# When updating sourcemod/metamod/other mods: make clean-mods && make install-mods && make + OUT=$(CSGOSL_ROOT)/out CONTRIBOUT=$(CSGOSL_ROOT)/contribs.txt CONTRIBOUTTCL=$(CSGOSL_ROOT)/src/contribs.tcl diff --git a/mods/linux/Makefile b/mods/linux/Makefile index 3aabd8f..0b9aecb 100755 --- a/mods/linux/Makefile +++ b/mods/linux/Makefile @@ -2,11 +2,11 @@ TARGET=linux include ../common.mk METAMOD_HOME_URL="http://www.metamodsource.net/" -METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-linux.tar.gz" -METAMOD_VERSION="1.11.0-git1145" +METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1147-linux.tar.gz" +METAMOD_VERSION="1.11.0-git1147" SOURCEMOD_HOME_URL="http://www.sourcemod.net/" -SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-linux.tar.gz" -SOURCEMOD_VERSION="1.10.0-git6528" +SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6544-linux.tar.gz" +SOURCEMOD_VERSION="1.10.0-git6544" export all: mods diff --git a/mods/windows/Makefile b/mods/windows/Makefile index fe19bad..e5fce1e 100755 --- a/mods/windows/Makefile +++ b/mods/windows/Makefile @@ -2,11 +2,11 @@ TARGET=windows include ../common.mk METAMOD_HOME_URL="http://www.metamodsource.net/" -METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-windows.zip" -METAMOD_VERSION="1.11.0-git1145" +METAMOD_URL="https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1147-windows.zip" +METAMOD_VERSION="1.11.0-git1147" SOURCEMOD_HOME_URL="http://www.sourcemod.net/" -SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-windows.zip" -SOURCEMOD_VERSION="1.10.0-git6528" +SOURCEMOD_URL="https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6544-windows.zip" +SOURCEMOD_VERSION="1.10.0-git6544" export all: mods diff --git a/src/contribs.tcl b/src/contribs.tcl index 98cbfa8..fbcc1d1 100644 --- a/src/contribs.tcl +++ b/src/contribs.tcl @@ -17,24 +17,24 @@ set windows_img_url "http://www.tcl.tk/starkits/img.kit" set windows_wget_version "1.20.3-win32" set windows_wget_home_url "https://www.gnu.org/software/wget" set windows_wget_url "https://eternallybored.org/misc/wget/releases/wget-1.20.3-win32.zip" -set linux_metamod_version "1.11.0-git1145" +set linux_metamod_version "1.11.0-git1147" set linux_metamod_home_url "http://www.metamodsource.net/" -set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-linux.tar.gz" -set linux_sourcemod_version "1.10.0-git6528" +set linux_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1147-linux.tar.gz" +set linux_sourcemod_version "1.10.0-git6544" set linux_sourcemod_home_url "http://www.sourcemod.net/" -set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-linux.tar.gz" +set linux_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6544-linux.tar.gz" set linux_franug_knifes_version "sha-ff449c6-2016-05-05" set linux_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes" set linux_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip" set linux_franug_weapon_paints_version "sha-fc7178d-2016-05-05" set linux_franug_weapon_paints_home_url "https://github.com/Franc1sco/Franug-Weapon_Paints" set linux_franug_weapon_paints_url "https://github.com/Franc1sco/Franug-Weapon_Paints/archive/fc7178d.zip" -set linux_weapon_restrict_version "3.1.7" -set linux_weapon_restrict_home_url "https://forums.alliedmods.net/showthread.php?p=950174" -set linux_weapon_restrict_url "https://forums.alliedmods.net/attachment.php?attachmentid=162251" set linux_warmod_version "17.08.12.1053" set linux_warmod_home_url "https://forums.alliedmods.net/showthread.php?t=225474" set linux_warmod_url "https://warmod.bitbucket.io/plugins/warmod.smx" +set linux_weapon_restrict_version "3.1.7" +set linux_weapon_restrict_home_url "https://forums.alliedmods.net/showthread.php?p=950174" +set linux_weapon_restrict_url "https://forums.alliedmods.net/attachment.php?attachmentid=162251" set linux_multi1v1_version "1.1.9" set linux_multi1v1_home_url "https://github.com/splewis/csgo-multi-1v1" set linux_multi1v1_url "https://github.com/splewis/csgo-multi-1v1/releases/download/1.1.9/multi1v1_1.1.9.zip" @@ -59,12 +59,12 @@ set linux_shanapu_myweaponallocator_url "https://github.com/shanapu/MyWeaponAllo set linux_splewis_pugsetup_version "2.0.5" set linux_splewis_pugsetup_home_url "https://forums.alliedmods.net/showthread.php?t=244114" set linux_splewis_pugsetup_url "https://github.com/splewis/csgo-pug-setup/releases/download/2.0.5/pugsetup_2.0.5.zip" -set windows_metamod_version "1.11.0-git1145" +set windows_metamod_version "1.11.0-git1147" set windows_metamod_home_url "http://www.metamodsource.net/" -set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1145-windows.zip" -set windows_sourcemod_version "1.10.0-git6528" +set windows_metamod_url "https://mms.alliedmods.net/mmsdrop/1.11/mmsource-1.11.0-git1147-windows.zip" +set windows_sourcemod_version "1.10.0-git6544" set windows_sourcemod_home_url "http://www.sourcemod.net/" -set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6528-windows.zip" +set windows_sourcemod_url "https://sm.alliedmods.net/smdrop/1.10/sourcemod-1.10.0-git6544-windows.zip" set windows_franug_knifes_version "sha-ff449c6-2016-05-05" set windows_franug_knifes_home_url "https://github.com/Franc1sco/Franug-Knifes" set windows_franug_knifes_url "https://github.com/Franc1sco/Franug-Knifes/archive/ff449c6.zip" diff --git a/src/server_support.tcl b/src/server_support.tcl index ccaa504..556f365 100755 --- a/src/server_support.tcl +++ b/src/server_support.tcl @@ -398,8 +398,8 @@ proc UpdateServer {} { set validateInstall [GetConfigValue $steamConfig validateinstall] set fileId [open "$steamUpdateFilename" "w"] - puts $fileId "login anonymous" puts $fileId "force_install_dir \"$serverFolder\"" + puts $fileId "login anonymous" if { $validateInstall == "1"} { puts $fileId "app_update 740 validate" } else { diff --git a/src/version.tcl b/src/version.tcl index 9d3c84c..0ec53dc 100755 --- a/src/version.tcl +++ b/src/version.tcl @@ -3,4 +3,4 @@ # The next line is executed by /bin/sh, but not tcl \ exec wish "$0" ${1+"$@"} -set version "2.12" +set version "2.13"