Apparently Unvanquished is written with a q

This commit is contained in:
DeathByDenim 2022-02-04 17:53:34 -05:00
parent 1a1d35419a
commit 5b3e32f7f2
Signed by: DeathByDenim
GPG Key ID: 4A475283D925365B
6 changed files with 29 additions and 30 deletions

View File

@ -49,7 +49,7 @@ cp console2web/console2web.py /usr/bin/console2web
"$(dirname "$0")"/scripts/deploy_openhv.sh "$(dirname "$0")"/scripts/deploy_openhv.sh
"$(dirname "$0")"/scripts/deploy_openspades.sh "$(dirname "$0")"/scripts/deploy_openspades.sh
"$(dirname "$0")"/scripts/deploy_teeworlds.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 "$(dirname "$0")"/scripts/deploy_xonotic.sh
# Web dashboard # Web dashboard

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Unvanguished # Unvanquished
unvanquished_directory="/opt/unvanquished-${unvanquished_version}" 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 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 unzip -o -f -d ${TMPDIR:-/tmp} ${TMPDIR:-/tmp}/unvanquished.zip
@ -13,9 +13,9 @@ fi
mv ${TMPDIR:-/tmp}/unvanquished*/pkg ${unvanquished_directory}/share mv ${TMPDIR:-/tmp}/unvanquished*/pkg ${unvanquished_directory}/share
rm -rf ${TMPDIR:-/tmp}/unvanquished* rm -rf ${TMPDIR:-/tmp}/unvanquished*
mkdir -p ${systemuserhome}/unvanguished_home/config mkdir -p ${systemuserhome}/unvanquished_home/config
cat > ${systemuserhome}/unvanguished_home/config/unvanguished.cfg <<EOF cat > ${systemuserhome}/unvanquished_home/config/unvanquished.cfg <<EOF
set server.private 1 set server.private 1
set g_needpass 0 set g_needpass 0
set sv_hostname "^NUnvanquished ^3onFOSS-LAN" set sv_hostname "^NUnvanquished ^3onFOSS-LAN"
set g_motd "^2get news on ^5${LINODE_ID}" set g_motd "^2get news on ^5${LINODE_ID}"
@ -28,15 +28,15 @@ set g_mapConfigs "map"
set g_initialMapRotation rotation1 set g_initialMapRotation rotation1
map yocto map yocto
EOF EOF
chown -R ${systemuser}: ${systemuserhome}/unvanguished_home chown -R ${systemuser}: ${systemuserhome}/unvanquished_home
cat > /etc/systemd/system/unvanguished.service <<EOF cat > /etc/systemd/system/unvanquished.service <<EOF
[Unit] [Unit]
Description=Unvanguished server Description=Unvanquished server
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/console2web -p 62549 ${unvanquished_directory}/bin/daemonded -pakpath ${unvanquished_directory}/share/pkg/ -libpath ${unvanquished_directory}/bin/ -homepath \${HOME}/unvanguished_home/ +exec unvanguished.cfg ExecStart=/usr/bin/console2web -p 62549 ${unvanquished_directory}/bin/daemonded -pakpath ${unvanquished_directory}/share/pkg/ -libpath ${unvanquished_directory}/bin/ -homepath \${HOME}/unvanquished_home/ +exec unvanquished.cfg
Restart=on-failure Restart=on-failure
User=${systemuser} User=${systemuser}
@ -45,7 +45,6 @@ WantedBy=multi-user.target
EOF EOF
systemctl daemon-reload systemctl daemon-reload
systemctl enable --now unvanguished.service systemctl enable --now unvanquished.service
firewall-cmd --zone=public --add-port=27960/udp --permanent firewall-cmd --zone=public --add-port=27960/udp --permanent

View File

@ -6,7 +6,7 @@
<link rel="stylesheet" href="css/bootstrap.min.css"> <link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/terminal.css"> <link rel="stylesheet" href="css/terminal.css">
<script src="js/terminalcolors.js" charset="utf-8"></script> <script src="js/terminalcolors.js" charset="utf-8"></script>
<script src="js/unvanguished.js" charset="utf-8"></script> <script src="js/unvanquished.js" charset="utf-8"></script>
<script src="js/mindustry.js" charset="utf-8"></script> <script src="js/mindustry.js" charset="utf-8"></script>
<script src="js/xonotic.js" charset="utf-8"></script> <script src="js/xonotic.js" charset="utf-8"></script>
</head> </head>
@ -36,11 +36,11 @@
</div> </div>
<form id="mindustry_form" onsubmit="return false;"><input id="mindustry_command" size="80" autocomplete="off"></input><button id="mindustry_submit">Enter</button></form> <form id="mindustry_form" onsubmit="return false;"><input id="mindustry_command" size="80" autocomplete="off"></input><button id="mindustry_submit">Enter</button></form>
<h4>Unvanguished</h4> <h4>Unvanquished</h4>
<div id="unvanguished_output"> <div id="unvanquished_output">
<p>Unvanguished console</p> <p>Unvanquished console</p>
</div> </div>
<form id="unvanguished_form" onsubmit="return false;"><input id="unvanguished_command" size="80" autocomplete="off"></input><button id="unvanguished_submit">Enter</button></form> <form id="unvanquished_form" onsubmit="return false;"><input id="unvanquished_command" size="80" autocomplete="off"></input><button id="unvanquished_submit">Enter</button></form>
<h4>Xonotic</h4> <h4>Xonotic</h4>
<div id="xonotic_output"> <div id="xonotic_output">

View File

@ -55,7 +55,7 @@
text-shadow: 0; text-shadow: 0;
} }
#unvanguished_output { #unvanquished_output {
border: solid grey; border: solid grey;
background-color: var(--terminal-color-background); background-color: var(--terminal-color-background);
width: min(95%, 1024px); width: min(95%, 1024px);
@ -66,7 +66,7 @@
flex-direction: column-reverse; flex-direction: column-reverse;
} }
#unvanguished_output p { #unvanquished_output p {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: monospace; font-family: monospace;
@ -77,11 +77,11 @@
display: inline-block; display: inline-block;
} }
#unvanguished_command { #unvanquished_command {
width: calc(min(95%, 1024px) - 10em); width: calc(min(95%, 1024px) - 10em);
} }
#unvanguished_submit { #unvanquished_submit {
width: 10em; width: 10em;
padding: 0; padding: 0;
margin: 0; margin: 0;

View File

@ -36,7 +36,7 @@
<li>OpenSpades (<a href="https://github.com/yvt/openspades/releases">download</a>)</li> <li>OpenSpades (<a href="https://github.com/yvt/openspades/releases">download</a>)</li>
<li>SuperTuxKart (<a href="https://supertuxkart.net/Download">download</a>)</li> <li>SuperTuxKart (<a href="https://supertuxkart.net/Download">download</a>)</li>
<li>Teeworlds (<a href="https://www.teeworlds.com/?page=downloads">download</a>)</li> <li>Teeworlds (<a href="https://www.teeworlds.com/?page=downloads">download</a>)</li>
<li>Unvanguished (<a href="https://unvanquished.net/download/">download</a>)</li> <li>Unvanquished (<a href="https://unvanquished.net/download/">download</a>)</li>
<li>Xonotic (<a href="https://xonotic.org/download/">download</a>)</li> <li>Xonotic (<a href="https://xonotic.org/download/">download</a>)</li>
</ul> </ul>
<p>Enjoy!</p> <p>Enjoy!</p>

View File

@ -1,20 +1,20 @@
function unvanguished_init() { function unvanquished_init() {
const command_form = document.getElementById('unvanguished_form'); const command_form = document.getElementById('unvanquished_form');
const command_input = document.getElementById('unvanguished_command'); const command_input = document.getElementById('unvanquished_command');
// Connect the command submission // Connect the command submission
if(command_input && command_form) { if(command_input && command_form) {
command_form.addEventListener('submit', function(){ command_form.addEventListener('submit', function(){
let line = document.createElement('p') let line = document.createElement('p')
line.innerHTML = '<span class="TERM_FOREGROUND_7_INTENSE">$ </span>' + command_input.value; line.innerHTML = '<span class="TERM_FOREGROUND_7_INTENSE">$ </span>' + command_input.value;
unvanguished_output.prepend(line); unvanquished_output.prepend(line);
socket.send(command_input.value); socket.send(command_input.value);
command_input.value = ""; command_input.value = "";
}); });
} }
// Create WebSocket connection. // 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 // Connection opened
socket.addEventListener('open', function (event) { socket.addEventListener('open', function (event) {
@ -23,15 +23,15 @@ function unvanguished_init() {
// Listen for messages // Listen for messages
socket.addEventListener('message', function (event) { socket.addEventListener('message', function (event) {
const unvanguished_output = document.getElementById('unvanguished_output'); const unvanquished_output = document.getElementById('unvanquished_output');
let line = document.createElement('p') let line = document.createElement('p')
line.innerHTML = convertDaemonedCodeToHtml(event.data); line.innerHTML = convertDaemonedCodeToHtml(event.data);
unvanguished_output.prepend(line); unvanquished_output.prepend(line);
}); });
} }
if (document.readyState === 'loading') { if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', unvanguished_init); document.addEventListener('DOMContentLoaded', unvanquished_init);
} else { } else {
unvanguished_init(); unvanquished_init();
} }