Changeset 204


Ignore:
Timestamp:
Nov 22, 2014, 10:55:28 PM (10 years ago)
Author:
alloc
Message:

Scripts 63

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • bootstrapper/bootstrap.sh

    r65 r204  
    11#!/bin/bash
    2 VERSION=4
     2VERSION=5
    33
    44if [ `id -u` -ne 0 ]; then
     
    183183}
    184184
    185 installLinuxEngine() {
    186         echo -e "Downloading and installing Linux engine\n"
    187         wget -nv http://illy.bz/fi/7dtd/linux_files.tar.gz -O /tmp/linux_files.tar.gz
    188         tar --touch -xzf /tmp/linux_files.tar.gz -C /home/sdtd/
    189 
    190         chown sdtd.sdtd -R /home/sdtd/linux_files
    191         chmod 0644 -R /home/sdtd/linux_files
    192         find /home/sdtd/linux_files -type d -exec chmod 0755 {} \;
    193         chmod 0755 /home/sdtd/linux_files/engine/7DaysToDie.x86
    194 
    195         echo -e "\n=============================================================\n\n"
    196 }
    197 
    198185setSteamLoginData() {
    199186        echo -e "Steam account data\n"
     
    265252        setupUser
    266253        installManagementScripts
    267         installLinuxEngine
    268254        setSteamLoginData
    269255        installSteamCmdAndSDTD
  • scripts/usr/local/lib/7dtd/VERSION

    r195 r204  
    1 Version: 61
    2 Release: 2014-09-18
    3 DediBuild: 385244
     1Version: 63
     2Release: 2014-11-22
     3DediBuild: 451483
    44
  • scripts/usr/local/lib/7dtd/commands/start.sh

    r72 r204  
    3333               
    3434                for H in $(getHooksFor serverPreStart); do
    35                         $H $INSTANCE
     35                        $H $1
    3636                done
    3737
     
    3939                SSD_DAEMON="--background --no-close"
    4040                SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
    41                 OPTS="-logfile $(getInstancePath $1)/logs/output_log.txt -configfile=$(getInstancePath $1)/config.xml -dedicated"
     41                OPTS="-logfile $(getInstancePath $1)/logs/output_log.txt -configfile=$(getInstancePath $1)/config.xml"
    4242               
    43                 LD_LIBRARY_PATH=$SDTD_BASE/linux_files LC_ALL=C $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDie.x86 -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
     43                LC_ALL=C $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDie.x86 -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
    4444                sleep 1
    4545
    4646                for H in $(getHooksFor serverPostStart); do
    47                         $H $INSTANCE
     47                        $H $1
    4848                done
    4949
  • scripts/usr/local/lib/7dtd/commands/stop.sh

    r169 r204  
    2828        if [ $res -eq 1 ]; then
    2929                for H in $(getHooksFor serverPreStop); do
    30                         $H $INSTANCE
     30                        $H $1
    3131                done
    3232
     
    5454
    5555                for H in $(getHooksFor serverPostStop); do
    56                         $H $INSTANCE
     56                        $H $1
    5757                done
    5858
  • scripts/usr/local/lib/7dtd/commands/updateengine.sh

    r102 r204  
    7575
    7676                cd $SDTD_BASE/steamcmd
    77                 ./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine "+app_update 294420" validate +quit
     77                ./steamcmd.sh +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine "+app_update 294420" validate +quit
    7878
    79                 cp $SDTD_BASE/linux_files/engine/* $SDTD_BASE/engine/ -R
    8079                cp $SDTD_BASE/engine/7DaysToDie_Data/Managed/Assembly-CSharp.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/Assembly-CSharp.dll_orig
    8180                cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/7DaysToDie_Data/Managed/
    82                 cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
    8381
    8482                chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine
  • scripts/usr/local/lib/7dtd/monitor-log.sh

    r87 r204  
    100100$NOBUF tr -d '\r' |
    101101$NOBUF grep -v "^(Filename: " |
    102 $NOBUF sed -r 's/^[0-9]+[.,][0-9]+ (.*)$/\1/' |
     102$NOBUF sed -r 's/^[0-9]+-[0-9]+-[0-9]+T[0-9]+:[0-9]+:[0-9]+ [0-9]+[.,][0-9]+ (.*)$/\1/' |
    103103while read line ; do
    104104        if [ -n "$line" ]; then
  • scripts/usr/local/lib/7dtd/serverconfig.sh

    r119 r204  
    6666
    6767
     68serverconfig_ServerDescription_QueryName() {
     69        echo "Server description"
     70}
     71serverconfig_ServerDescription_Type() {
     72        echo "string"
     73}
     74
     75
     76
     77serverconfig_ServerWebsiteURL_QueryName() {
     78        echo "Server website URL"
     79}
     80serverconfig_ServerWebsiteURL_Type() {
     81        echo "string"
     82}
     83
     84
     85
    6886serverconfig_ServerPassword_QueryName() {
    6987        echo "Server password"
     
    106124
    107125serverconfig_GameName_QueryName() {
    108         echo "Game name"
     126        echo "Random gen seed"
    109127}
    110128serverconfig_GameName_Type() {
     
    119137}
    120138serverconfig_GameName_ErrorMessage() {
    121         echo "Game name cannot be empty."
     139        echo "Seed cannot be empty."
    122140}
    123141
     
    125143
    126144serverconfig_GameDifficulty_QueryName() {
    127         echo "Difficulty"
     145        echo "Difficulty (+ damage given / received)"
    128146}
    129147serverconfig_GameDifficulty_Type() {
     
    134152}
    135153serverconfig_GameDifficulty_Range() {
    136         echo "0-4"
     154        echo "0-5"
    137155}
    138156serverconfig_GameDifficulty_Values() {
    139         config_allowed_values=("Very easy" "Easy" "Medium" "Hard" "Very hard")
     157        config_allowed_values=("Scavenger (200% / 50%)" "Adventurer (150% / 75%)" "Nomad (100% / 100%)" "Warrior (75% / 150%)" "Survivalist (50% / 200%)" "Insane (25% / 250%)")
    140158}
    141159
     
    175193
    176194
    177 serverconfig_ShowFriendPlayerOnMap_QueryName() {
    178         echo "Show friends on map"
    179 }
    180 serverconfig_ShowFriendPlayerOnMap_Type() {
    181         echo "boolean"
    182 }
    183 serverconfig_ShowFriendPlayerOnMap_Default() {
    184         echo "true"
    185 }
    186 serverconfig_ShowFriendPlayerOnMap_ErrorMessage() {
    187         echo "Not a valid boolean given (true/false or yes/no or y/n)."
    188 }
    189 
    190 
    191 
    192195serverconfig_BuildCreate_QueryName() {
    193196        echo "Item spawn menu"
     
    197200}
    198201serverconfig_BuildCreate_Default() {
    199         echo "true"
     202        echo "false"
    200203}
    201204serverconfig_BuildCreate_ErrorMessage() {
     
    212215}
    213216serverconfig_DayNightLength_Default() {
    214         echo "45"
     217        echo "40"
    215218}
    216219
     
    227230}
    228231serverconfig_FriendlyFire_ErrorMessage() {
    229         echo "Not a valid boolean given (true/false or yes/no or y/n)."
    230 }
    231 
    232 
    233 
    234 serverconfig_DayCount_QueryName() {
    235         echo "Day Count (Horde)"
    236 }
    237 serverconfig_DayCount_Type() {
    238         echo "number"
    239 }
    240 serverconfig_DayCount_Default() {
    241         echo "3"
    242 }
    243 
    244 
    245 
    246 serverconfig_FragLimit_QueryName() {
    247         echo "Frag limit (DM)"
    248 }
    249 serverconfig_FragLimit_Type() {
    250         echo "number"
    251 }
    252 serverconfig_FragLimit_Default() {
    253         echo "5"
    254 }
    255 
    256 
    257 
    258 serverconfig_MatchLength_QueryName() {
    259         echo "Match length (DM)"
    260 }
    261 serverconfig_MatchLength_Type() {
    262         echo "number"
    263 }
    264 serverconfig_MatchLength_Default() {
    265         echo "15"
    266 }
    267 
    268 
    269 
    270 serverconfig_RebuildMap_QueryName() {
    271         echo "Rebuild map on round restart"
    272 }
    273 serverconfig_RebuildMap_Type() {
    274         echo "boolean"
    275 }
    276 serverconfig_RebuildMap_Default() {
    277         echo "false"
    278 }
    279 serverconfig_RebuildMap_ErrorMessage() {
    280232        echo "Not a valid boolean given (true/false or yes/no or y/n)."
    281233}
     
    408360}
    409361serverconfig_DropOnQuit_Default() {
    410         echo "0"
     362        echo "1"
    411363}
    412364serverconfig_DropOnQuit_Range() {
     
    456408
    457409
    458 serverconfig_PlayerDamageGiven_QueryName() {
    459         echo "Damage Player->Zombies"
    460 }
    461 serverconfig_PlayerDamageGiven_Type() {
    462         echo "number"
    463 }
    464 serverconfig_PlayerDamageGiven_Default() {
    465         echo "2"
    466 }
    467 serverconfig_PlayerDamageGiven_Range() {
    468         echo "0-4"
    469 }
    470 serverconfig_PlayerDamageGiven_Values() {
    471         config_allowed_values=("50%" "75%" "100%" "150%" "200%")
    472 }
    473 
    474 
    475 serverconfig_PlayerDamageRecieved_QueryName() {
    476         echo "Damage Zombies->Player"
    477 }
    478 serverconfig_PlayerDamageRecieved_Type() {
    479         echo "number"
    480 }
    481 serverconfig_PlayerDamageRecieved_Default() {
    482         echo "2"
    483 }
    484 serverconfig_PlayerDamageRecieved_Range() {
    485         echo "0-4"
    486 }
    487 serverconfig_PlayerDamageRecieved_Values() {
    488         config_allowed_values=("50%" "75%" "100%" "150%" "200%")
    489 }
    490 
    491 
    492410serverconfig_EnemySenseMemory_QueryName() {
    493411        echo "Sense memory (seconds)"
     
    670588}
    671589serverconfig_AirDropFrequency_Default() {
    672         echo "24"
     590        echo "72"
    673591}
    674592
     
    685603
    686604
    687 serverconfig_VACEnabled_QueryName() {
    688         echo "Enable Valve Anti Cheat"
    689 }
    690 serverconfig_VACEnabled_Type() {
     605serverconfig_EACEnabled_QueryName() {
     606        echo "Enable EasyAntiCheat"
     607}
     608serverconfig_EACEnabled_Type() {
    691609        echo "boolean"
    692610}
    693 serverconfig_VACEnabled_Default() {
     611serverconfig_EACEnabled_Default() {
    694612        echo "true"
    695613}
    696 serverconfig_VACEnabled_ErrorMessage() {
     614serverconfig_EACEnabled_ErrorMessage() {
    697615        echo "Not a valid boolean given (true/false or yes/no or y/n)."
    698616}
     
    710628        echo "--------------------------------"
    711629        for CV in \
    712                         ServerName ServerPassword ServerIsPublic ServerPort ServerMaxPlayerCount \
    713                         DisableNAT VACEnabled MaxSpawnedZombies \
     630                        ServerName ServerPassword ServerIsPublic ServerPort ServerMaxPlayerCount ServerDescription ServerWebsiteURL \
     631                        DisableNAT EACEnabled MaxSpawnedZombies \
    714632                        ; do
    715633                $1 $CV
     
    752670}
    753671
    754 configEditGameTypeSpecific() {
    755         local CV
    756        
    757         echo "Options for specific game types"
    758         echo "--------------------------------"
    759         for CV in \
    760                         DayCount FragLimit MatchLength RebuildMap \
    761                         ; do
    762                 $1 $CV
    763         done
    764         echo
    765 }
    766 
    767672configEditGeneric() {
    768673        local CV
     
    771676        echo "--------------------------------"
    772677        for CV in \
    773                         ShowFriendPlayerOnMap FriendlyFire BuildCreate \
     678                        FriendlyFire BuildCreate \
    774679                        BlockDurabilityModifier \
    775680                        ; do
     
    814719        for CV in \
    815720                        GameDifficulty ZombiesRun \
    816                         PlayerDamageGiven PlayerDamageRecieved EnemySenseMemory EnemySpawnMode EnemyDifficulty \
     721                        EnemySenseMemory EnemySpawnMode EnemyDifficulty \
    817722                        ; do
    818723                $1 $CV
     
    839744        configEditRemoteControl "$1"
    840745        configEditGameType "$1"
    841         configEditGameTypeSpecific "$1"
    842746        configEditGeneric "$1"
    843747        configEditDropLoot "$1"
Note: See TracChangeset for help on using the changeset viewer.