Changeset 35


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

Version 10: Native linux

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • bootstrapper/bootstrap.sh

    r34 r35  
    1212INSTALLOPTIONALDEPS=0
    1313
    14 DEPENDENCIES="gcc wget tr xvfb mono-runtime rsync xmlstarlet gcc"
     14DEPENDENCIES="gcc wget tr rsync xmlstarlet"
    1515
    1616if [ -n "$(command -v apt-get)" ]; then
     
    2727
    2828if [ $IS64BIT -eq 1 ]; then
    29         DEPENDENCIES="$DEPENDENCIES lib32gcc1 wine:i386"
    30 else
    31         DEPENDENCIES="$DEPENDENCIES wine"
     29        DEPENDENCIES="$DEPENDENCIES lib32gcc1"
    3230fi
    3331
     
    6159                echo "the website regarding the prerequisites"
    6260                echo "(https://7dtd.illy.bz)."
     61                echo
     62                echo "Also make sure you have the 32 Bit version of libgcc installed!"
     63                echo
    6364                echo "Do you want to continue anyway?"
    6465                select yn in "Yes" "No"; do
     
    114115                return
    115116        fi
     117       
     118        ldconfig -p | grep gcc | grep -v 64 > /dev/null
     119        if [ $? -ne 0 ]; then
     120                echo "There probably is no 32 Bit version of libgcc installed."
     121                echo "Do you want to continue?"
     122                select yn in "Yes" "No"; do
     123                        case $yn in
     124                                Yes)
     125                                        break;;
     126                                No)
     127                                        echo "Aborting."
     128                                        exit 0
     129                                        ;;
     130                        esac
     131                done
     132        fi
    116133
    117134        echo 1
     
    154171        chown root.root start-stop-daemon
    155172        chmod 0755 start-stop-daemon
     173
     174        echo -e "\n=============================================================\n\n"
     175}
     176
     177installLinuxEngine() {
     178        echo -e "Downloading and installing Linux engine\n"
     179        wget -nv http://illy.bz/fi/7dtd/linux_files.tar.gz -O /tmp/linux_files.tar.gz
     180        tar --touch -xzf /tmp/linux_files.gz -C /home/sdtd/
     181
     182        chown sdtd.sdtd /home/sdtd/linux_files
     183        chmod 0644 /home/sdtd/linux_files
     184        chmod 0755 /home/sdtd/linux_files/engine/7DaysToDie.x86
    156185
    157186        echo -e "\n=============================================================\n\n"
     
    229258        setupUser
    230259        installManagementScripts
     260        installLinuxEngine
    231261        setSteamLoginData
    232262        installSteamCmdAndSDTD
  • scripts/etc/7dtd.conf

    r32 r35  
    1717# Paths to binaries. Use "which BINARYNAME" to find the path of a single binary
    1818export RSYNC=/usr/bin/rsync
    19 export WINE=/usr/bin/wine
    2019export XMLSTARLET=/usr/bin/xmlstarlet
    2120export PKILL=/usr/bin/pkill
  • 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.