From c58b33871f134748804fa81bf15f5e83e70d6c8c Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Fri, 25 Nov 2016 15:03:29 +0000 Subject: [PATCH] clean up old ubuntu init and services folders --- init/05-fix-the-time.sh | 5 ----- init/30_set_the_config.sh | 14 -------------- root/etc/services.d/minetest/run | 5 +++-- services/minetest/run | 14 -------------- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 init/05-fix-the-time.sh delete mode 100644 init/30_set_the_config.sh delete mode 100644 services/minetest/run diff --git a/init/05-fix-the-time.sh b/init/05-fix-the-time.sh deleted file mode 100644 index 865736e..0000000 --- a/init/05-fix-the-time.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -if [[ $(cat /etc/timezone) != $TZ ]] ; then - echo "$TZ" > /etc/timezone - exec dpkg-reconfigure -f noninteractive tzdata -fi diff --git a/init/30_set_the_config.sh b/init/30_set_the_config.sh deleted file mode 100644 index b68a37a..0000000 --- a/init/30_set_the_config.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -mkdir -p /config/.minetest/games /config/.minetest/mods - -if [ ! -f "/config/.minetest/main-config/minetest.conf" ]; then -mkdir -p /config/.minetest/main-config -cp /defaults/minetest.conf /config/.minetest/main-config/minetest.conf -fi - -if [ ! -d "/config/.minetest/games/minimal" ]; then -cp -pr /defaults/games/* /config/.minetest/games/ -fi - -chown -R abc:abc /config/.minetest diff --git a/root/etc/services.d/minetest/run b/root/etc/services.d/minetest/run index 4da1d5f..00cd2d6 100644 --- a/root/etc/services.d/minetest/run +++ b/root/etc/services.d/minetest/run @@ -2,15 +2,16 @@ # predefine some variables world_part="--world " +# shellcheck disable=SC2059 world_set=$world # set world_string variable to use user-defined world or default world. if [ -z "$world" ]; then world_string=" " else -world_string=$world_part$world_set +world_string=($world_part$world_set) fi exec \ - s6-setuidgid abc minetestserver $world_string \ + s6-setuidgid abc minetestserver "${worldstring[@]}" \ --config /config/.minetest/main-config/minetest.conf --port 30000 diff --git a/services/minetest/run b/services/minetest/run deleted file mode 100644 index 3c79348..0000000 --- a/services/minetest/run +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# predefine some variables -world_part="--world " -world_set=$world - -# set world_string variable to use user-defined world or default world. -if [ -z "$world" ]; then -world_string=" " -else -world_string=$world_part$world_set -fi -exec /sbin/setuser abc minetestserver $world_string --config /config/.minetest/main-config/minetest.conf --port 30000 -