epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing several ShellCheck warnings

Browse Source
This commit is contained in:
Brenton Horne
2018-11-20 04:33:28 +10:00
committed by Paul Chote
parent 807a40c209
commit 2d4d6cdc1b
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launch-dedicated.sh
View File

@@ -14,8 +14,8 @@ EnableSingleplayer="${EnableSingleplayer:-"False"}"
Password="${Password:-""}" Password="${Password:-""}"
while true; do while true; do
mono --debug OpenRA.Server.exe Game.Mod=$Mod \ mono --debug OpenRA.Server.exe Game.Mod="$Mod" \
Server.Name="$Name" Server.ListenPort=$ListenPort \ Server.Name="$Name" Server.ListenPort="$ListenPort" \
Server.AdvertiseOnline=$AdvertiseOnline \ Server.AdvertiseOnline="$AdvertiseOnline" \
Server.EnableSingleplayer=$EnableSingleplayer Server.Password=$Password Server.EnableSingleplayer="$EnableSingleplayer" Server.Password="$Password"
done done

4
launch-game.sh
View File

@@ -5,7 +5,7 @@ MODLAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
MODARG='' MODARG=''
if [ z"${*#*Game.Mod}" = z"$*" ] if [ z"${*#*Game.Mod}" = z"$*" ]
then then
if which zenity > /dev/null if command -v zenity > /dev/null
then then
TITLE=$(zenity --forms --add-combo="" --combo-values="Red Alert|Tiberian Dawn|Dune 2000|Tiberian Sun" --text "Select mod" --title="" || echo "cancel") TITLE=$(zenity --forms --add-combo="" --combo-values="Red Alert|Tiberian Dawn|Dune 2000|Tiberian Sun" --text "Select mod" --title="" || echo "cancel")
if [ "$TITLE" = "cancel" ]; then exit 0 if [ "$TITLE" = "cancel" ]; then exit 0
@@ -31,7 +31,7 @@ if [ $? != 0 ] && [ $? != 1 ]; then
elif command -v kdialog > /dev/null; then elif command -v kdialog > /dev/null; then
kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}" kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}"
else else
printf "${ERROR_MESSAGE}\n" printf "%s\n" "${ERROR_MESSAGE}"
fi fi
exit 1 exit 1
fi fi

16
packaging/linux/buildpackage.sh
View File

@@ -10,12 +10,12 @@ command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&
DEPENDENCIES_TAG="20180723" DEPENDENCIES_TAG="20180723"
if [ $# -eq "0" ]; then if [ $# -eq "0" ]; then
echo "Usage: `basename $0` version [outputdir]" echo "Usage: $(basename "$0") version [outputdir]"
exit 1 exit 1
fi fi
# Set the working dir to the location of this script # Set the working dir to the location of this script
cd $(dirname $0) cd "$(dirname "$0")" || exit 1
TAG="$1" TAG="$1"
OUTPUTDIR="$2" OUTPUTDIR="$2"
@@ -35,7 +35,7 @@ elif [[ ${TAG} == pkgtest* ]]; then
SUFFIX="-pkgtest" SUFFIX="-pkgtest"
fi fi
pushd "${TEMPLATE_ROOT}" > /dev/null pushd "${TEMPLATE_ROOT}" > /dev/null || exit 1
if [ ! -d "${OUTPUTDIR}" ]; then if [ ! -d "${OUTPUTDIR}" ]; then
echo "Output directory '${OUTPUTDIR}' does not exist."; echo "Output directory '${OUTPUTDIR}' does not exist.";
@@ -44,14 +44,14 @@ fi
echo "Building core files" echo "Building core files"
pushd ${SRCDIR} > /dev/null pushd "${SRCDIR}" > /dev/null || exit 1
make linux-dependencies make linux-dependencies
make core SDK="-sdk:4.5" make core SDK="-sdk:4.5"
make version VERSION="${TAG}" make version VERSION="${TAG}"
make install-engine prefix="usr" DESTDIR="${BUILTDIR}/" make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/" make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/"
popd > /dev/null popd > /dev/null || exit 1
# Add native libraries # Add native libraries
echo "Downloading dependencies" echo "Downloading dependencies"
@@ -79,14 +79,14 @@ build_appimage() {
MOD_ID=${1} MOD_ID=${1}
DISPLAY_NAME=${2} DISPLAY_NAME=${2}
APPDIR="$(pwd)/${MOD_ID}.appdir" APPDIR="$(pwd)/${MOD_ID}.appdir"
APPIMAGE="OpenRA-$(echo ${DISPLAY_NAME} | sed 's/ /-/g')${SUFFIX}-x86_64.AppImage" APPIMAGE="OpenRA-$(echo "${DISPLAY_NAME}" | sed 's/ /-/g')${SUFFIX}-x86_64.AppImage"
cp -r "${BUILTDIR}" "${APPDIR}" cp -r "${BUILTDIR}" "${APPDIR}"
# Add mod files # Add mod files
pushd "${SRCDIR}" > /dev/null pushd "${SRCDIR}" > /dev/null || exit 1
cp -r "mods/${MOD_ID}" mods/modcontent "${APPDIR}/usr/lib/openra/mods" cp -r "mods/${MOD_ID}" mods/modcontent "${APPDIR}/usr/lib/openra/mods"
popd > /dev/null popd > /dev/null || exit 1
# Add launcher and icons # Add launcher and icons
sed "s/{MODID}/${MOD_ID}/g" AppRun.in | sed "s/{MODNAME}/${DISPLAY_NAME}/g" > AppRun.temp sed "s/{MODID}/${MOD_ID}/g" AppRun.in | sed "s/{MODNAME}/${DISPLAY_NAME}/g" > AppRun.temp

18
packaging/osx/buildpackage.sh
View File

@@ -12,12 +12,12 @@ fi
LAUNCHER_TAG="osx-launcher-20171118" LAUNCHER_TAG="osx-launcher-20171118"
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: `basename $0` tag outputdir" echo "Usage: $(basename "$0") tag outputdir"
exit 1 exit 1
fi fi
# Set the working dir to the location of this script # Set the working dir to the location of this script
cd $(dirname $0) cd "$(dirname "$0")" || exit 1
TAG="$1" TAG="$1"
OUTPUTDIR="$2" OUTPUTDIR="$2"
@@ -44,10 +44,10 @@ populate_template() {
# Deletes from the first argument's mod dirs all the later arguments # Deletes from the first argument's mod dirs all the later arguments
delete_mods() { delete_mods() {
pushd "${BUILTDIR}/${1}/Contents/Resources/mods" > /dev/null pushd "${BUILTDIR}/${1}/Contents/Resources/mods" > /dev/null || exit 1
shift shift
rm -rf $@ rm -rf "$@"
pushd > /dev/null pushd > /dev/null || exit 1
} }
echo "Building launchers" echo "Building launchers"
@@ -70,12 +70,12 @@ modify_plist "{DEV_VERSION}" "${TAG}" "${BUILTDIR}/OpenRA.app/Contents/Info.plis
modify_plist "{FAQ_URL}" "http://wiki.openra.net/FAQ" "${BUILTDIR}/OpenRA.app/Contents/Info.plist" modify_plist "{FAQ_URL}" "http://wiki.openra.net/FAQ" "${BUILTDIR}/OpenRA.app/Contents/Info.plist"
echo "Building core files" echo "Building core files"
pushd ${SRCDIR} > /dev/null pushd "${SRCDIR}" > /dev/null || exit 1
make osx-dependencies make osx-dependencies
make core SDK="-sdk:4.5" make core SDK="-sdk:4.5"
make version VERSION="${TAG}" make version VERSION="${TAG}"
make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app" make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
popd > /dev/null popd > /dev/null || exit 1
curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md
markdown Changelog.md > "${BUILTDIR}/OpenRA.app/Contents/Resources/CHANGELOG.html" markdown Changelog.md > "${BUILTDIR}/OpenRA.app/Contents/Resources/CHANGELOG.html"
@@ -106,10 +106,10 @@ else
curl -s -L -O https://github.com/OpenRA/libdmg-hfsplus/archive/master.zip || exit 3 curl -s -L -O https://github.com/OpenRA/libdmg-hfsplus/archive/master.zip || exit 3
unzip -qq master.zip unzip -qq master.zip
rm master.zip rm master.zip
pushd libdmg-hfsplus-master > /dev/null pushd libdmg-hfsplus-master > /dev/null || exit 1
cmake . > /dev/null cmake . > /dev/null
make > /dev/null make > /dev/null
popd > /dev/null popd > /dev/null || exit 1
if [[ ! -f libdmg-hfsplus-master/dmg/dmg ]] ; then if [[ ! -f libdmg-hfsplus-master/dmg/dmg ]] ; then
echo "libdmg-hfsplus compilation failed" echo "libdmg-hfsplus compilation failed"

2
packaging/package-all.sh
View File

@@ -10,7 +10,7 @@ export GIT_TAG="$1"
export BUILD_OUTPUT_DIR="$2" export BUILD_OUTPUT_DIR="$2"
# Set the working dir to the location of this script using bash parameter expansion # Set the working dir to the location of this script using bash parameter expansion
cd "${0%/*}" cd "${0%/*}" || exit 1
#build packages using a subshell so directory changes do not persist beyond the function #build packages using a subshell so directory changes do not persist beyond the function
function build_package() ( function build_package() (

8
packaging/source/buildpackage.sh
View File

@@ -2,18 +2,18 @@
# OpenRA packaging script for versioned source tarball # OpenRA packaging script for versioned source tarball
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: `basename $0` tag outputdir" echo "Usage: $(basename "$0") tag outputdir"
exit 1 exit 1
fi fi
# Set the working dir to the location of this script # Set the working dir to the location of this script
cd $(dirname $0) cd "$(dirname "$0")" || exit 1
TAG="$1" TAG="$1"
OUTPUTDIR="$2" OUTPUTDIR="$2"
SRCDIR="$(pwd)/../.." SRCDIR="$(pwd)/../.."
pushd ${SRCDIR} > /dev/null pushd "${SRCDIR}" > /dev/null || exit 1
make version VERSION="${TAG}" make version VERSION="${TAG}"
git ls-tree HEAD --name-only -r -z | xargs -0 tar cvjf "${OUTPUTDIR}/OpenRA-${TAG}-source.tar.bz2" git ls-tree HEAD --name-only -r -z | xargs -0 tar cvjf "${OUTPUTDIR}/OpenRA-${TAG}-source.tar.bz2"
popd > /dev/null popd > /dev/null || exit 1

8
packaging/update-wiki.sh
View File

@@ -24,15 +24,15 @@ mkdir -p "$(dirname "$SSH_KEY")"
openssl aes-256-cbc -k "$KEY" -in ssh.enc -d -out "$SSH_KEY" openssl aes-256-cbc -k "$KEY" -in ssh.enc -d -out "$SSH_KEY"
chmod 0600 "$SSH_KEY" chmod 0600 "$SSH_KEY"
rm -rf $HOME/openra-wiki rm -rf "$HOME/openra-wiki"
git clone git@github.com:OpenRA/OpenRA.wiki.git $HOME/openra-wiki git clone git@github.com:OpenRA/OpenRA.wiki.git "$HOME/openra-wiki"
mono --debug ../OpenRA.Utility.exe all --docs > "${HOME}/openra-wiki/Traits${TAG}.md" mono --debug ../OpenRA.Utility.exe all --docs > "${HOME}/openra-wiki/Traits${TAG}.md"
mono --debug ../OpenRA.Utility.exe all --weapon-docs > "${HOME}/openra-wiki/Weapons${TAG}.md" mono --debug ../OpenRA.Utility.exe all --weapon-docs > "${HOME}/openra-wiki/Weapons${TAG}.md"
mono --debug ../OpenRA.Utility.exe all --lua-docs > "${HOME}/openra-wiki/Lua API${TAG}.md" mono --debug ../OpenRA.Utility.exe all --lua-docs > "${HOME}/openra-wiki/Lua API${TAG}.md"
mono --debug ../OpenRA.Utility.exe all --settings-docs > "${HOME}/openra-wiki/Settings${TAG}.md" mono --debug ../OpenRA.Utility.exe all --settings-docs > "${HOME}/openra-wiki/Settings${TAG}.md"
pushd $HOME/openra-wiki pushd "$HOME/openra-wiki" || exit 1
git config --local user.email "orabot@users.noreply.github.com" git config --local user.email "orabot@users.noreply.github.com"
git config --local user.name "orabot" git config --local user.name "orabot"
git add "Traits${TAG}.md" git add "Traits${TAG}.md"
@@ -40,6 +40,6 @@ git add "Lua API${TAG}.md"
git add "Settings${TAG}.md" git add "Settings${TAG}.md"
git commit -m "Update trait and scripting documentation for branch $1" && git commit -m "Update trait and scripting documentation for branch $1" &&
git push origin master git push origin master
popd popd || exit
shred -u "$SSH_KEY" shred -u "$SSH_KEY"

10
packaging/windows/buildpackage.sh
View File

@@ -5,12 +5,12 @@ command -v markdown >/dev/null 2>&1 || { echo >&2 "Windows packaging requires ma
command -v makensis >/dev/null 2>&1 || { echo >&2 "Windows packaging requires makensis."; exit 1; } command -v makensis >/dev/null 2>&1 || { echo >&2 "Windows packaging requires makensis."; exit 1; }
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: `basename $0` tag outputdir" echo "Usage: $(basename "$0") tag outputdir"
exit 1 exit 1
fi fi
# Set the working dir to the location of this script # Set the working dir to the location of this script
cd $(dirname $0) cd "$(dirname "$0")" || exit 1
TAG="$1" TAG="$1"
OUTPUTDIR="$2" OUTPUTDIR="$2"
@@ -32,17 +32,17 @@ function makelauncher()
sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
mcs -sdk:4.5 WindowsLauncher.cs -warn:4 -codepage:utf8 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4" mcs -sdk:4.5 WindowsLauncher.cs -warn:4 -codepage:utf8 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
rm WindowsLauncher.cs rm WindowsLauncher.cs
mono "${SRCDIR}/fixheader.exe" $1 > /dev/null mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null
} }
echo "Building core files" echo "Building core files"
pushd ${SRCDIR} > /dev/null pushd "${SRCDIR}" > /dev/null || exit 1
make windows-dependencies make windows-dependencies
make core SDK="-sdk:4.5" make core SDK="-sdk:4.5"
make version VERSION="${TAG}" make version VERSION="${TAG}"
make install-core gameinstalldir="" DESTDIR="${BUILTDIR}" make install-core gameinstalldir="" DESTDIR="${BUILTDIR}"
popd > /dev/null popd > /dev/null || exit 1
echo "Compiling Windows launchers" echo "Compiling Windows launchers"
makelauncher "${BUILTDIR}/RedAlert.exe" "Red Alert" "ra" RedAlert.ico makelauncher "${BUILTDIR}/RedAlert.exe" "Red Alert" "ra" RedAlert.ico

2
thirdparty/fetch-geoip-db.sh vendored
View File

@@ -5,7 +5,7 @@ set -e
download_dir="${0%/*}/download" download_dir="${0%/*}/download"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
cd "${download_dir}" cd "${download_dir}" || exit 1
filename="GeoLite2-Country.mmdb.gz" filename="GeoLite2-Country.mmdb.gz"

2
thirdparty/fetch-thirdparty-deps-osx.sh vendored
View File

@@ -4,7 +4,7 @@ LAUNCHER_TAG="osx-launcher-20171118"
download_dir="${0%/*}/download/osx" download_dir="${0%/*}/download/osx"
mkdir -p "$download_dir" mkdir -p "$download_dir"
cd "$download_dir" cd "$download_dir" || exit 1
if [ ! -f libSDL2.dylib ]; then if [ ! -f libSDL2.dylib ]; then
echo "Fetching OS X SDL2 library from GitHub." echo "Fetching OS X SDL2 library from GitHub."

2
thirdparty/fetch-thirdparty-deps-windows.sh vendored
View File

@@ -6,7 +6,7 @@ set -e
download_dir="${0%/*}/download/windows" download_dir="${0%/*}/download/windows"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
cd "${download_dir}" cd "${download_dir}" || exit 1
if [ ! -f SDL2.dll ]; then if [ ! -f SDL2.dll ]; then
echo "Fetching SDL2 from libsdl.org" echo "Fetching SDL2 from libsdl.org"

6
thirdparty/fetch-thirdparty-deps.sh vendored
View File

@@ -11,7 +11,7 @@ set -e
download_dir="${0%/*}/download" download_dir="${0%/*}/download"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
cd "${download_dir}" cd "${download_dir}" || exit 1
if [ ! -f StyleCopPlus.dll ]; then if [ ! -f StyleCopPlus.dll ]; then
echo "Fetching StyleCopPlus from NuGet" echo "Fetching StyleCopPlus from NuGet"
@@ -79,7 +79,7 @@ if [ ! -f FuzzyLogicLibrary.dll ]; then
rm -rf FuzzyLogicLibrary rm -rf FuzzyLogicLibrary
fi fi
if [ ! -f SDL2-CS.dll -o ! -f SDL2-CS.dll.config ]; then if [ ! -f SDL2-CS.dll ] || [ ! -f SDL2-CS.dll.config ]; then
echo "Fetching SDL2-CS from GitHub." echo "Fetching SDL2-CS from GitHub."
if command -v curl >/dev/null 2>&1; then if command -v curl >/dev/null 2>&1; then
curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll
@@ -90,7 +90,7 @@ if [ ! -f SDL2-CS.dll -o ! -f SDL2-CS.dll.config ]; then
fi fi
fi fi
if [ ! -f OpenAL-CS.dll -o ! -f OpenAL-CS.dll.config ]; then if [ ! -f OpenAL-CS.dll ] || [ ! -f OpenAL-CS.dll.config ]; then
echo "Fetching OpenAL-CS from GitHub." echo "Fetching OpenAL-CS from GitHub."
if command -v curl >/dev/null 2>&1; then if command -v curl >/dev/null 2>&1; then
curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll