Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Super Tux Kart -> SuperTuxKart, and additional wording fixes #1410

Merged
merged 3 commits into from
Mar 13, 2020
Merged

Super Tux Kart -> SuperTuxKart, and additional wording fixes #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43083bc
Super Tux Kart -> SuperTuxKart
qwertychouskie Mar 13, 2020
8982d79
Super Tux Kart -> SuperTuxKart, and additional wording fixes
qwertychouskie Mar 13, 2020
65b69b3
Super Tux Kart -> SuperTuxKart
qwertychouskie Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/supertuxkart/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Google LLC All Rights Reserved.
# Copyright 2020 Google LLC, All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

#
# Makefile for building the Super Tux Kart server
# Makefile for building the SuperTuxKart server
#

# __ __ _ _ _
Expand Down Expand Up @@ -43,4 +43,4 @@ build:

# check if hosted on Google Cloud Registry
gcr-check:
gcloud container images describe $(image_tag)
gcloud container images describe $(image_tag)
10 changes: 5 additions & 5 deletions examples/supertuxkart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Super Tux Kart Example
# SuperTuxKart Game Server Example

Example using a [Super Tux Kart](https://supertuxkart.net/) dedicated game server.
Example using a [SuperTuxKart](https://supertuxkart.net/) dedicated game server.

This example wraps the Super Tux Kart server with a [Go](https://golang.org) binary, and introspects
This example wraps the SuperTuxKart server with a [Go](https://golang.org) binary, and introspects
the log file to provide the event hooks for the SDK integration.

It is not a direct integration, but is an approach for to integrate with existing
It is not a direct integration, but is an approach to integrate with existing
dedicated game servers.

You will need to download the Super Tux Kart client separately to play.
You will need to download the SuperTuxKart client separately to play.
18 changes: 9 additions & 9 deletions examples/supertuxkart/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020 Google LLC All Rights Reserved.
// Copyright 2020 Google LLC, All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,10 +28,10 @@ import (
sdk "agones.dev/agones/sdks/go"
)

// logLocation is the path to the location of the Super Tux Kart log file
// logLocation is the path to the location of the SuperTuxKart log file
const logLocation = "/.config/supertuxkart/config-0.10/server_config.log"

// main intercepts the log file of the Super Tux Kart gameserver and uses it
// main intercepts the log file of the SuperTuxKart gameserver and uses it
// to determine if the game server is ready or not.
func main() {
input := flag.String("i", "", "the command and arguments to execute the server binary")
Expand All @@ -40,14 +40,14 @@ func main() {
fmt.Println(">>> Connecting to Agones with the SDK")
s, err := sdk.NewSDK()
if err != nil {
log.Fatalf(">>> Could not connect to sdk: %v", err)
log.Fatalf(">>> Could not connect to SDK: %v", err)
}

fmt.Println(">>> Starting health checking")
go doHealth(s)

fmt.Println(">>> Starting wrapper for Super Tux Kart!")
fmt.Printf(">>> Command run for Super Tux Kart server: %s \n", *input)
fmt.Println(">>> Starting wrapper for SuperTuxKart")
fmt.Printf(">>> Command being run for SuperTuxKart server: %s \n", *input)

cmdString := strings.Split(*input, " ")
command, args := cmdString[0], cmdString[1:]
Expand All @@ -57,10 +57,10 @@ func main() {
cmd.Stdout = os.Stdout

if err := cmd.Start(); err != nil {
log.Fatalf(">>> Error Starting Cmd: %v", err)
log.Fatalf(">>> Error starting cmd: %v", err)
}

// Super Tux Kart refuses to output to foreground, so we're going to
// SuperTuxKart refuses to output to foreground, so we're going to
// poll the server log.
ready := false
home, err := os.UserHomeDir()
Expand Down Expand Up @@ -99,7 +99,7 @@ func main() {
}

err = cmd.Wait()
log.Fatalf(">>> Super Tux Kart shutdown unexpectedly: %v", err)
log.Fatalf(">>> SuperTuxKart shutdown unexpectedly: %v", err)
}

// doHealth sends the regular Health Pings
Expand Down