From 29ee60236ebdbcd5ea1bac5b7e7764bd5ecd6471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Jul 2019 09:15:18 +0200 Subject: [PATCH] Switch scripts to bash Closes #268, #269 --- 0.17/Dockerfile | 2 +- 0.17/files/docker-entrypoint.sh | 2 +- 0.17/files/scenario.sh | 2 +- 0.17/files/scenario2map.sh | 2 +- 0.17/files/update-mods.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/0.17/Dockerfile b/0.17/Dockerfile index 786d8e7..060290e 100644 --- a/0.17/Dockerfile +++ b/0.17/Dockerfile @@ -20,7 +20,7 @@ ENV PORT=34197 \ PGID="$PGID" RUN mkdir -p /opt /factorio && \ - apk add --update --no-cache pwgen su-exec binutils gettext libintl shadow curl jq && \ + apk add --update --no-cache pwgen su-exec binutils gettext libintl shadow curl jq bash && \ curl -sSL "https://www.factorio.com/get-download/$VERSION/headless/linux64" \ -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \ echo "$SHA1 /tmp/factorio_headless_x64_$VERSION.tar.xz" | sha1sum -c && \ diff --git a/0.17/files/docker-entrypoint.sh b/0.17/files/docker-entrypoint.sh index a021fe2..2f4fe38 100755 --- a/0.17/files/docker-entrypoint.sh +++ b/0.17/files/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [ "$NRTMPSAVES" -gt 0 ]; then rm -f "$SAVES"/*.tmp.zip fi -if [[ $UPDATE_MODS_ON_START ]]; then +if [[ ${UPDATE_MODS_ON_START:-} ]]; then ./docker-update-mods.sh fi diff --git a/0.17/files/scenario.sh b/0.17/files/scenario.sh index 5b4b32c..3b890db 100755 --- a/0.17/files/scenario.sh +++ b/0.17/files/scenario.sh @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/bash -x if [ -z "$1" ]; then echo "No argument supplied" fi diff --git a/0.17/files/scenario2map.sh b/0.17/files/scenario2map.sh index 57a3d62..958fdf2 100755 --- a/0.17/files/scenario2map.sh +++ b/0.17/files/scenario2map.sh @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/bash -x if [ -z "$1" ]; then echo "No argument supplied" fi diff --git a/0.17/files/update-mods.sh b/0.17/files/update-mods.sh index 41d7299..1cc57d4 100755 --- a/0.17/files/update-mods.sh +++ b/0.17/files/update-mods.sh @@ -12,7 +12,7 @@ print_step() echo "$1" } -print_success() +print_success() { echo "$1" }