diff --git a/deploy.sh b/deploy.sh index 87f3016..eb1f579 100755 --- a/deploy.sh +++ b/deploy.sh @@ -49,7 +49,7 @@ cp console2web/console2web.py /usr/bin/console2web "$(dirname "$0")"/scripts/deploy_openhv.sh "$(dirname "$0")"/scripts/deploy_openspades.sh "$(dirname "$0")"/scripts/deploy_teeworlds.sh -"$(dirname "$0")"/scripts/deploy_unvanguished.sh +"$(dirname "$0")"/scripts/deploy_unvanquished.sh "$(dirname "$0")"/scripts/deploy_xonotic.sh # Web dashboard diff --git a/scripts/deploy_unvanguished.sh b/scripts/deploy_unvanquished.sh similarity index 75% rename from scripts/deploy_unvanguished.sh rename to scripts/deploy_unvanquished.sh index cccb58a..6f8e37b 100755 --- a/scripts/deploy_unvanguished.sh +++ b/scripts/deploy_unvanquished.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -# Unvanguished +# Unvanquished unvanquished_directory="/opt/unvanquished-${unvanquished_version}" curl --location "https://github.com/Unvanquished/Unvanquished/releases/download/v${unvanquished_version}/unvanquished_${unvanquished_version}.zip" > ${TMPDIR:-/tmp}/unvanquished.zip unzip -o -f -d ${TMPDIR:-/tmp} ${TMPDIR:-/tmp}/unvanquished.zip @@ -13,9 +13,9 @@ fi mv ${TMPDIR:-/tmp}/unvanquished*/pkg ${unvanquished_directory}/share rm -rf ${TMPDIR:-/tmp}/unvanquished* -mkdir -p ${systemuserhome}/unvanguished_home/config -cat > ${systemuserhome}/unvanguished_home/config/unvanguished.cfg < ${systemuserhome}/unvanquished_home/config/unvanquished.cfg < /etc/systemd/system/unvanguished.service < /etc/systemd/system/unvanquished.service < - + @@ -36,11 +36,11 @@
-

Unvanguished

-
-

Unvanguished console

+

Unvanquished

+
+

Unvanquished console

-
+

Xonotic

diff --git a/website/css/terminal.css b/website/css/terminal.css index e42799f..53e94d0 100644 --- a/website/css/terminal.css +++ b/website/css/terminal.css @@ -55,7 +55,7 @@ text-shadow: 0; } -#unvanguished_output { +#unvanquished_output { border: solid grey; background-color: var(--terminal-color-background); width: min(95%, 1024px); @@ -66,7 +66,7 @@ flex-direction: column-reverse; } -#unvanguished_output p { +#unvanquished_output p { margin: 0; padding: 0; font-family: monospace; @@ -77,11 +77,11 @@ display: inline-block; } -#unvanguished_command { +#unvanquished_command { width: calc(min(95%, 1024px) - 10em); } -#unvanguished_submit { +#unvanquished_submit { width: 10em; padding: 0; margin: 0; diff --git a/website/index.html b/website/index.html index 3576413..e0cdb37 100644 --- a/website/index.html +++ b/website/index.html @@ -36,7 +36,7 @@
  • OpenSpades (download)
  • SuperTuxKart (download)
  • Teeworlds (download)
  • -
  • Unvanguished (download)
  • +
  • Unvanquished (download)
  • Xonotic (download)
  • Enjoy!

    diff --git a/website/js/unvanguished.js b/website/js/unvanquished.js similarity index 63% rename from website/js/unvanguished.js rename to website/js/unvanquished.js index 682e4a7..957118d 100644 --- a/website/js/unvanguished.js +++ b/website/js/unvanquished.js @@ -1,20 +1,20 @@ -function unvanguished_init() { - const command_form = document.getElementById('unvanguished_form'); - const command_input = document.getElementById('unvanguished_command'); +function unvanquished_init() { + const command_form = document.getElementById('unvanquished_form'); + const command_input = document.getElementById('unvanquished_command'); // Connect the command submission if(command_input && command_form) { command_form.addEventListener('submit', function(){ let line = document.createElement('p') line.innerHTML = '$ ' + command_input.value; - unvanguished_output.prepend(line); + unvanquished_output.prepend(line); socket.send(command_input.value); command_input.value = ""; }); } // Create WebSocket connection. - const socket = new WebSocket("ws://192.168.122.229/unvanguished") + const socket = new WebSocket("ws://192.168.122.229/unvanquished") // Connection opened socket.addEventListener('open', function (event) { @@ -23,15 +23,15 @@ function unvanguished_init() { // Listen for messages socket.addEventListener('message', function (event) { - const unvanguished_output = document.getElementById('unvanguished_output'); + const unvanquished_output = document.getElementById('unvanquished_output'); let line = document.createElement('p') line.innerHTML = convertDaemonedCodeToHtml(event.data); - unvanguished_output.prepend(line); + unvanquished_output.prepend(line); }); } if (document.readyState === 'loading') { - document.addEventListener('DOMContentLoaded', unvanguished_init); + document.addEventListener('DOMContentLoaded', unvanquished_init); } else { - unvanguished_init(); + unvanquished_init(); }