From 73ab2cd4dc62f0a49ea59557aa29d6794441aa6d Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 28 Nov 2020 11:30:07 +0000 Subject: [PATCH] Replace "template" with "SDK" in error messages. --- Makefile | 2 +- fetch-engine.sh | 4 ++-- launch-dedicated.sh | 4 ++-- launch-game.sh | 4 ++-- packaging/linux/buildpackage.sh | 8 ++++---- packaging/macos/buildpackage.sh | 4 ++-- packaging/package-all.sh | 8 ++++---- packaging/windows/buildpackage.sh | 6 +++--- utility.sh | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 1d5e87e..dae1cc2 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ ifeq ($(PYTHON),) PYTHON = $(shell command -v python 2> /dev/null) endif ifeq ($(PYTHON),) -$(error "The OpenRA mod template requires python.") +$(error "The OpenRA mod SDK requires python.") endif VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) diff --git a/fetch-engine.sh b/fetch-engine.sh index 93783b8..5850bba 100755 --- a/fetch-engine.sh +++ b/fetch-engine.sh @@ -2,11 +2,11 @@ # Helper script used to check and update engine dependencies # This should not be called manually -command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl or wget."; exit 1; } +command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires curl or wget."; exit 1; } if command -v python3 >/dev/null 2>&1; then PYTHON="python3" else - command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } + command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires python."; exit 1; } PYTHON="python" fi diff --git a/launch-dedicated.sh b/launch-dedicated.sh index fe2a65e..e2cdc59 100755 --- a/launch-dedicated.sh +++ b/launch-dedicated.sh @@ -5,11 +5,11 @@ # Read the file to see which settings you can override set -e -command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; } +command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires mono."; exit 1; } if command -v python3 >/dev/null 2>&1; then PYTHON="python3" else - command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } + command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires python."; exit 1; } PYTHON="python" fi diff --git a/launch-game.sh b/launch-game.sh index e2de548..c0d67b6 100755 --- a/launch-game.sh +++ b/launch-game.sh @@ -1,11 +1,11 @@ #!/bin/sh set -e -command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; } +command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires mono."; exit 1; } if command -v python3 >/dev/null 2>&1; then PYTHON="python3" else - command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } + command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires python."; exit 1; } PYTHON="python" fi diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index dcc0390..3b159d7 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -2,10 +2,10 @@ # OpenRA packaging script for Linux (AppImage) set -e -command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires make."; exit 1; } -command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python 3."; exit 1; } -command -v tar >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires tar."; exit 1; } -command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl or wget."; exit 1; } +command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Linux packaging requires make."; exit 1; } +command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Linux packaging requires python 3."; exit 1; } +command -v tar >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Linux packaging requires tar."; exit 1; } +command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Linux packaging requires curl or wget."; exit 1; } require_variables() { missing="" diff --git a/packaging/macos/buildpackage.sh b/packaging/macos/buildpackage.sh index 02fd8cd..f8f4915 100755 --- a/packaging/macos/buildpackage.sh +++ b/packaging/macos/buildpackage.sh @@ -19,8 +19,8 @@ if [[ "$OSTYPE" != "darwin"* ]]; then exit 1 fi -command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires make."; exit 1; } -command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } +command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK macOS packaging requires make."; exit 1; } +command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK macOS packaging requires python 3."; exit 1; } require_variables() { missing="" diff --git a/packaging/package-all.sh b/packaging/package-all.sh index d205866..a5e2193 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -13,12 +13,12 @@ else OUTPUTDIR=$2 fi -command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python 3."; exit 1; } -command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires make."; exit 1; } +command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK packaging requires python 3."; exit 1; } +command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK packaging requires make."; exit 1; } if [[ "$OSTYPE" != "darwin"* ]]; then - command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl or wget."; exit 1; } - command -v makensis >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires makensis."; exit 1; } + command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK packaging requires curl or wget."; exit 1; } + command -v makensis >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK packaging requires makensis."; exit 1; } fi PACKAGING_DIR=$(python3 -c "import os; print(os.path.dirname(os.path.realpath('$0')))") diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 096ab58..9ce758e 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -command -v makensis >/dev/null 2>&1 || { echo >&2 "Windows packaging requires makensis."; exit 1; } -command -v convert >/dev/null 2>&1 || { echo >&2 "Windows packaging requires ImageMagick."; exit 1; } -command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } +command -v makensis >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Windows packaging requires makensis."; exit 1; } +command -v convert >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Windows packaging requires ImageMagick."; exit 1; } +command -v python3 >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK Windows packaging requires python 3."; exit 1; } require_variables() { missing="" diff --git a/utility.sh b/utility.sh index 57251eb..0473046 100755 --- a/utility.sh +++ b/utility.sh @@ -4,13 +4,13 @@ # $ Mod="" ./launch-utility.sh # Launch the OpenRA.Utility with a specific mod set -e -command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires make."; exit 1; } -command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; } +command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires make."; exit 1; } +command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires mono."; exit 1; } if command -v python3 >/dev/null 2>&1; then PYTHON="python3" else - command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; } + command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires python."; exit 1; } PYTHON="python" fi