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

Sciprts: Set pipefail or remove pipes

Browse Source 
Errors in pipes are ignored otherwise
This commit is contained in:
Unrud
2022-06-05 14:07:27 +02:00
committed by Matthias Mailänder
parent 946cd8f322
commit 1b9a86c0a0
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/functions.sh
View File

@@ -249,15 +249,15 @@ install_linux_shortcuts() (
# wrapper scripts # wrapper scripts
install -d "${BUILD_PATH}/${BIN_PATH}" install -d "${BUILD_PATH}/${BIN_PATH}"
sed 's/{DEBUG}/--debug/' "${SRC_PATH}/packaging/linux/openra.in" | sed "s|{GAME_INSTALL_DIR}|${OPENRA_PATH}|" | sed "s|{BIN_DIR}|${BIN_PATH}|" | sed "s/{MODID}/${MOD_ID}/g" | sed "s/{TAG}/${VERSION}/g" | sed "s/{MODNAME}/${MOD_NAME}/g" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}" sed -e 's/{DEBUG}/--debug/' -e "s|{GAME_INSTALL_DIR}|${OPENRA_PATH}|" -e "s|{BIN_DIR}|${BIN_PATH}|" -e "s/{MODID}/${MOD_ID}/g" -e "s/{TAG}/${VERSION}/g" -e "s/{MODNAME}/${MOD_NAME}/g" "${SRC_PATH}/packaging/linux/openra.in" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}"
sed 's/{DEBUG}/--debug/' "${SRC_PATH}/packaging/linux/openra-server.in" | sed "s|{GAME_INSTALL_DIR}|${OPENRA_PATH}|" | sed "s/{MODID}/${MOD_ID}/g" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server" sed -e 's/{DEBUG}/--debug/' -e "s|{GAME_INSTALL_DIR}|${OPENRA_PATH}|" -e "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra-server.in" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server"
install -m755 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}" "${BUILD_PATH}/${BIN_PATH}" install -m755 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}" "${BUILD_PATH}/${BIN_PATH}"
install -m755 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server" "${BUILD_PATH}/${BIN_PATH}" install -m755 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server" "${BUILD_PATH}/${BIN_PATH}"
rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}" "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server" rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}" "${SRC_PATH}/packaging/linux/openra-${MOD_ID}-server"
# desktop files # desktop files
install -d "${BUILD_PATH}${SHARE_PATH}/applications" install -d "${BUILD_PATH}${SHARE_PATH}/applications"
sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra.desktop.in" | sed "s/{MODNAME}/${MOD_NAME}/g" | sed "s/{TAG}/${VERSION}/g" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop" sed -e "s/{MODID}/${MOD_ID}/g" -e "s/{MODNAME}/${MOD_NAME}/g" -e "s/{TAG}/${VERSION}/g" "${SRC_PATH}/packaging/linux/openra.desktop.in" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop"
install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop" "${BUILD_PATH}${SHARE_PATH}/applications" install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop" "${BUILD_PATH}${SHARE_PATH}/applications"
rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop" rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.desktop"
@@ -274,7 +274,7 @@ install_linux_shortcuts() (
# MIME info # MIME info
install -d "${BUILD_PATH}${SHARE_PATH}/mime/packages" install -d "${BUILD_PATH}${SHARE_PATH}/mime/packages"
sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra-mimeinfo.xml.in" | sed "s/{TAG}/${VERSION}/g" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml" sed -e "s/{MODID}/${MOD_ID}/g" -e "s/{TAG}/${VERSION}/g" "${SRC_PATH}/packaging/linux/openra-mimeinfo.xml.in" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml"
install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml" "${BUILD_PATH}${SHARE_PATH}/mime/packages/openra-${MOD_ID}.xml" install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml" "${BUILD_PATH}${SHARE_PATH}/mime/packages/openra-${MOD_ID}.xml"
rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml" rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.xml"
fi fi
@@ -322,7 +322,7 @@ install_linux_appdata() (
install -d "${BUILD_PATH}${SHARE_PATH}/metainfo" install -d "${BUILD_PATH}${SHARE_PATH}/metainfo"
sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra.metainfo.xml.in" | sed "s/{MOD_NAME}/${MOD_NAME}/g" | sed "s/{SCREENSHOT_RA}/${SCREENSHOT_RA}/g" | sed "s/{SCREENSHOT_CNC}/${SCREENSHOT_CNC}/g" | sed "s/{SCREENSHOT_D2K}/${SCREENSHOT_D2K}/g"> "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml" sed -e "s/{MODID}/${MOD_ID}/g" -e "s/{MOD_NAME}/${MOD_NAME}/g" -e "s/{SCREENSHOT_RA}/${SCREENSHOT_RA}/g" -e "s/{SCREENSHOT_CNC}/${SCREENSHOT_CNC}/g" -e "s/{SCREENSHOT_D2K}/${SCREENSHOT_D2K}/g" "${SRC_PATH}/packaging/linux/openra.metainfo.xml.in" > "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml"
install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml" "${BUILD_PATH}${SHARE_PATH}/metainfo" install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml" "${BUILD_PATH}${SHARE_PATH}/metainfo"
rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml" rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.metainfo.xml"

2
packaging/linux/buildpackage.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# OpenRA packaging script for Linux (AppImage) # OpenRA packaging script for Linux (AppImage)
set -o errexit || exit $? set -o errexit -o pipefail || exit $?
command -v tar >/dev/null 2>&1 || { echo >&2 "Linux packaging requires tar."; exit 1; } command -v tar >/dev/null 2>&1 || { echo >&2 "Linux packaging requires tar."; exit 1; }
command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "Linux packaging requires curl or wget."; exit 1; } command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "Linux packaging requires curl or wget."; exit 1; }

1
packaging/linux/openra.appimage.in
View File

@@ -11,6 +11,7 @@ if [ -n "${APPIMAGE}" ]; then
LAUNCHER=${APPIMAGE} LAUNCHER=${APPIMAGE}
APPIMAGEID=$(printf "file://%s" "${APPIMAGE}" | md5sum | cut -d' ' -f1) APPIMAGEID=$(printf "file://%s" "${APPIMAGE}" | md5sum | cut -d' ' -f1)
test -n "${APPIMAGEID}"
LAUNCHER_NAME="appimagekit_${APPIMAGEID}-openra-{MODID}.desktop" LAUNCHER_NAME="appimagekit_${APPIMAGEID}-openra-{MODID}.desktop"
LAUNCHER_PATH="${HOME}/.local/share/applications/${LAUNCHER_NAME}" LAUNCHER_PATH="${HOME}/.local/share/applications/${LAUNCHER_NAME}"
export SDL_VIDEO_X11_WMCLASS="openra-{MODID}-{TAG}" export SDL_VIDEO_X11_WMCLASS="openra-{MODID}-{TAG}"

6
packaging/macos/buildpackage.sh
View File

@@ -14,7 +14,7 @@
# MACOS_DEVELOPER_PASSWORD: App-specific password for the developer account # MACOS_DEVELOPER_PASSWORD: App-specific password for the developer account
# #
set -o errexit || exit $? set -o errexit -o pipefail || exit $?
MONO_TAG="osx-launcher-20201222" MONO_TAG="osx-launcher-20201222"
@@ -189,8 +189,8 @@ build_platform() {
for MOD in "Red Alert" "Tiberian Dawn"; do for MOD in "Red Alert" "Tiberian Dawn"; do
for f in $(find /Volumes/OpenRA/OpenRA\ -\ ${MOD}.app/Contents/MacOS/*); do for f in $(find /Volumes/OpenRA/OpenRA\ -\ ${MOD}.app/Contents/MacOS/*); do
g="/Volumes/OpenRA/OpenRA - Dune 2000.app/Contents/MacOS/"$(basename "${f}") g="/Volumes/OpenRA/OpenRA - Dune 2000.app/Contents/MacOS/"$(basename "${f}")
hashf=$(shasum "${f}" | awk '{ print $1 }') hashf=$(shasum "${f}" | awk '{ print $1 }') || :
hashg=$(shasum "${g}" | awk '{ print $1 }') hashg=$(shasum "${g}" | awk '{ print $1 }') || :
if [ "${hashf}" = "${hashg}" ]; then if [ "${hashf}" = "${hashg}" ]; then
echo "Deduplicating ${f}" echo "Deduplicating ${f}"
rm "${f}" rm "${f}"

2
packaging/package-all.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# OpenRA master packaging script # OpenRA master packaging script
set -o errexit || exit $? set -o errexit -o pipefail || exit $?
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: ${0##*/} version outputdir." echo "Usage: ${0##*/} version outputdir."

2
packaging/source/buildpackage.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# OpenRA packaging script for versioned source tarball # OpenRA packaging script for versioned source tarball
set -o errexit || exit $? set -o errexit -o pipefail || exit $?
if [ $# -ne "2" ]; then if [ $# -ne "2" ]; then
echo "Usage: $(basename "$0") tag outputdir" echo "Usage: $(basename "$0") tag outputdir"

2
packaging/windows/buildpackage.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# OpenRA packaging script for Windows # OpenRA packaging script for Windows
set -o errexit || exit $? set -o errexit -o pipefail || exit $?
command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "Windows packaging requires curl or wget."; exit 1; } command -v curl >/dev/null 2>&1 || command -v wget > /dev/null 2>&1 || { echo >&2 "Windows packaging requires curl or wget."; exit 1; }
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; }