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

MacOS buildpackage: Fix deduplication

Browse Source 
The variable `${MOD}` was not enclosed in quotes, but the value contained a space. This caused the argument to be split into two parts.
Using **find** isn't necessary due to globbing.
This commit is contained in:
Unrud
2022-06-14 15:57:34 +02:00
committed by abcdefg30
parent ab26878033
commit a2a34dafde
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/macos/buildpackage.sh
View File

@@ -185,21 +185,18 @@ build_platform() {
# Replace duplicate .NET runtime files with hard links to improve compression # Replace duplicate .NET runtime files with hard links to improve compression
if [ "${PLATFORM}" != "mono" ]; then if [ "${PLATFORM}" != "mono" ]; then
OIFS="$IFS"
IFS=$'\n'
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 "/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 [ -n "${hashf}" ] && [ "${hashf}" = "${hashg}" ]; then
echo "Deduplicating ${f}" echo "Deduplicating ${f}"
rm "${f}" rm "${f}"
ln "${g}" "${f}" ln "${g}" "${f}"
fi fi
done done
done done
IFS="$OIFS"
fi fi
chmod -Rf go-w /Volumes/OpenRA chmod -Rf go-w /Volumes/OpenRA