Changeset 35 for scripts/usr


Ignore:
Timestamp:
Jun 2, 2014, 2:42:48 AM (10 years ago)
Author:
alloc
Message:

Version 10: Native linux

Location:
scripts/usr/local/lib/7dtd
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • scripts/usr/local/lib/7dtd/VERSION

    r34 r35  
    1 Current version: 9
    2 Last edit: 2014-06-01
     1Current version: 10
     2Last edit: 2014-06-02
  • scripts/usr/local/lib/7dtd/commands/start.sh

    r25 r35  
    2020
    2121        if [ $(isRunning $1) -eq 0 ]; then
    22                 if [ ! `pgrep Xvfb` ]; then
    23                         echo "Xvfb not yet running. Starting..."
    24                         su -c "/usr/bin/Xvfb :1 -screen 0 640x480x16" $SDTD_USER 2>&1 | grep -v "Could not init font path element" &
    25                         sleep 3
    26                 fi
    27                 export DISPLAY=localhost:1.0
    28                
    2922                setAllPlayersOffline $1
    30                 rm $SDTD_BASE/engine/7DaysToDie_Data/output_log.txt
     23                rm $(getInstancePath $1)/output_log.txt
    3124               
    3225                for H in $(getHooksFor serverPreStart); do
     
    3730                SSD_DAEMON="--background --no-close"
    3831                SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
    39                 OPTS="-quit -batchmode -nographics -configfile=$(getInstancePath $1)/config.xml -dedicated"
     32                OPTS="-logfile $(getInstancePath $1)/output_log.txt -configfile=$(getInstancePath $1)/config.xml -dedicated"
    4033               
    41                 $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $WINE -- $SDTD_BASE/engine/7DaysToDie.exe $OPTS > $(getInstancePath $1)/stdout.log 2>&1
     34                $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDie.x86 -- $OPTS > $(getInstancePath $1)/stdout.log 2>&1
    4235                sleep 1
    4336
  • scripts/usr/local/lib/7dtd/commands/updateengine.sh

    r28 r35  
    2424
    2525        ./steamcmd.sh +@sSteamCmdForcePlatformType windows +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine "+app_update 251570" validate +quit
     26
     27        cp $SDTD_BASE/linux_files/engine/* $SDTD_BASE/engine/ -R
     28        cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
     29
    2630        chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine
    27 
    28         cp $SDTD_BASE/engine/Install/32bit/7DaysToDie.exe $SDTD_BASE/engine/
    29         cp $SDTD_BASE/engine/Install/32bit/mono.dll $SDTD_BASE/engine/7DaysToDie_Data/Mono/
    30         cp $SDTD_BASE/engine/Install/32bit/SteamworksManaged.dll $SDTD_BASE/engine/7DaysToDie_Data/Managed/
    3131}
    3232
  • scripts/usr/local/lib/7dtd/monitor-log.sh

    r23 r35  
    5050NOBUF="stdbuf -e0 -o0"
    5151
    52 $NOBUF tail -n 5000 -F $SDTD_BASE/engine/7DaysToDie_Data/output_log.txt |
     52$NOBUF tail -n 5000 -F $(getInstancePath $INSTANCE)/output_log.txt |
    5353$NOBUF tr '\\' '/' |
    5454$NOBUF tr -d '\r' |
  • scripts/usr/local/lib/7dtd/serverconfig.sh

    r24 r35  
    10091009        configCurrent_TelnetEnabled=true
    10101010        configCurrent_AdminFileName=admins.xml
    1011         configCurrent_SaveGameFolder="$(winepath -w $(getInstancePath "$1") 2>/dev/null | grep instances)"
     1011        configCurrent_SaveGameFolder="$(getInstancePath "$1")"
    10121012}
    10131013
Note: See TracChangeset for help on using the changeset viewer.