slitaz-dev-tools rev 290
tazcarft: small fixes and improvments
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun Mar 19 03:22:26 2017 +0100 (2017-03-19) |
parents | efc44bf94790 |
children | af4dbddd22bb |
files | tazcraft/README tazcraft/cgi-bin/tazcraft.cgi tazcraft/tazcraft |
line diff
1.1 --- a/tazcraft/README Sun Mar 19 01:32:00 2017 +0100 1.2 +++ b/tazcraft/README Sun Mar 19 03:22:26 2017 +0100 1.3 @@ -1,7 +1,9 @@ 1.4 +Tazcraft 1.5 +================================================================================ 1.6 1.7 -Minecraft custom tools for SliTaz GNU/Linux. Tazcraft can install and run Minecraft server 1.8 -as well as getting the client and starting to play. It can also optionaly install the Java 1.9 -Runtime Environement (JRE) 1.10 +Minecraft custom tools for SliTaz GNU/Linux. Tazcraft can install and run 1.11 +Minecraft server as well as getting the client and starting to play. It can 1.12 +also optionaly install the Java Runtime Environement (JRE). 1.13 1.14 1.15 Server configuration 1.16 @@ -13,3 +15,30 @@ 1.17 1 - Creative 1.18 2 - Adventure 1.19 3 - Spectator 1.20 + 1.21 + 1.22 +MOTD text colours and formating 1.23 +------------------------------- 1.24 + \u00A70 - BLACK 1.25 + \u00A71 - DARK BLUE 1.26 + \u00A72 - DARK GREEN 1.27 + \u00A73 - DARK AQUA 1.28 + \u00A74 - DARK RED 1.29 + \u00A75 - DARK PURPLE 1.30 + \u00A76 - GOLD 1.31 + \u00A77 - GRAY 1.32 + \u00A78 - DARK GRAY 1.33 + \u00A79 - INDIGO 1.34 + \u00A7a - GREEN 1.35 + \u00A7b - AQUA 1.36 + \u00A7c - RED 1.37 + \u00A7d - PINK 1.38 + \u00A7e - YELLOW 1.39 + \u00A7f - WHITE 1.40 + \u00A7k - Obfuscated 1.41 + \u00A7l - Bold 1.42 + \u00A7m - Strikethrough 1.43 + \u00A7n - Underline 1.44 + \u00A7o - Italic 1.45 + \u00A7r - Reset 1.46 +
2.1 --- a/tazcraft/cgi-bin/tazcraft.cgi Sun Mar 19 01:32:00 2017 +0100 2.2 +++ b/tazcraft/cgi-bin/tazcraft.cgi Sun Mar 19 03:22:26 2017 +0100 2.3 @@ -41,13 +41,14 @@ 2.4 </div> 2.5 <h1>Tazcraft Server</h1> 2.6 </header> 2.7 +<div id="content"> 2.8 2.9 -<div id="content"> 2.10 <h2>Welcome to Tazcraft</h2> 2.11 <p>A SliTaz GNU/Linux Minecraft server</p> 2.12 <pre> 2.13 -<img src="minecraft.png" alt="*" />Server address: <b>play.slitaz.org</b> 2.14 +<img src="minecraft.png" alt="*" />Server address: <b>play.slitaz.me</b> 2.15 </pre> 2.16 + 2.17 <h3>Configuration</h3> 2.18 <table> 2.19 <thead> 2.20 @@ -56,14 +57,13 @@ 2.21 </thead> 2.22 EOT 2.23 2.24 -for var in gamemode server-port level-name; do 2.25 +for var in gamemode server-port level-name difficulty max-players; do 2.26 get_value ${var} 2.27 done 2.28 2.29 # HTML footer 2.30 cat << EOT 2.31 </table> 2.32 - 2.33 </div> 2.34 <footer></footer> 2.35 </body>
3.1 --- a/tazcraft/tazcraft Sun Mar 19 01:32:00 2017 +0100 3.2 +++ b/tazcraft/tazcraft Sun Mar 19 03:22:26 2017 +0100 3.3 @@ -56,6 +56,14 @@ 3.4 fi 3.5 } 3.6 3.7 +# Change default motd 3.8 +check_motd() { 3.9 + motd=$(grep ^motd= ${config} | sed s'/motd=//') 3.10 + if [ "$motd" == "A Minecraft Server" ]; then 3.11 + sed -i s'/motd=.*/motd=\u00A72A Tazcraft Server/' ${config} 3.12 + fi 3.13 +} 3.14 + 3.15 # Get a value in 3.16 get_value() { 3.17 val=$(grep ^${1}= ${config} | cut -d "=" -f 2) 3.18 @@ -80,6 +88,7 @@ 3.19 3.20 -s|start) 3.21 check_java || exit 1 3.22 + check_motd 3.23 colorize 032 "Starting Minecraft server..." 3.24 [ ! "$gui" ] && opts="nogui" 3.25 cd ${server} 3.26 @@ -120,16 +129,18 @@ 3.27 colorize 032 "Minecraft Server" 3.28 echo "Version : $version" 3.29 echo "Home : $home" 3.30 + newline 3.31 3.32 colorize 032 "Server properties" 3.33 - for var in server-port level-name; do 3.34 + for var in gamemode server-port level-name difficulty max-players; do 3.35 get_value ${var} 3.36 done 3.37 + newline 3.38 3.39 if check_java; then 3.40 colorize 032 "Java Runtime Environment" 3.41 - echo "Java: $java" 3.42 - ${java} -version 3.43 + echo "Path: $java" 3.44 + ${java} -version #2>&1 | grep "version" 3.45 fi 3.46 newline ;; 3.47