Skip to content

Commit caa5daa

Browse files
Fix fake reaper splitting arguments with spaces (#66)
* Fix fake reaper splitting input with spaces * Use main repo version for reaper, since the module is tracked by the repo already * Fix packaging issues due to rename
1 parent 76bc4ed commit caa5daa

File tree

4 files changed

+10
-191
lines changed

4 files changed

+10
-191
lines changed

Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ endif
2929
umu/umu_version.json: umu/umu_version.json.in
3030
$(info :: Updating $(@) )
3131
cp $(<) $(<).tmp
32-
sed 's|##umu_version##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
33-
sed 's|##REAPER_VERSION##|$(shell git -C subprojects/reaper describe --always --long --tags)|g' -i $(<).tmp
32+
sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
33+
sed 's|##REAPER_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
3434
mv $(<).tmp $(@)
3535

3636
.PHONY: version
@@ -141,7 +141,7 @@ release: $(RELEASEDIR) | version
141141
$(info :: Creating source distribution for release )
142142
mkdir -p $(<)
143143
rm -rf umu/__pycache__
144-
cp -r umu flatpak subprojects Makefile.in configure.sh README.md LICENSE $(<)
144+
cp -r umu packaging subprojects Makefile.in configure.sh README.md LICENSE $(<)
145145
tar -cvzf $(<).tar.gz $(<)
146146

147147

flatpak/org.openwinecomponents.umu.launcher.yml

-183
This file was deleted.

umu/reaper

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env sh
22
# Fake reaper file to avoid errors while running from source
3-
args="$*"
4-
cmd=${args#* -- }
5-
$cmd
3+
while [ "$1" != "--" ]; do
4+
shift
5+
done
6+
shift
7+
"$@"

umu/umu_version.json.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"umu": {
33
"versions": {
4-
"launcher": "##umu_version##",
5-
"runner": "##umu_version##",
4+
"launcher": "##UMU_VERSION##",
5+
"runner": "##UMU_VERSION##",
66
"runtime_platform": "sniper_platform_0.20240125.75305",
77
"reaper": "##REAPER_VERSION##",
88
"pressure_vessel": "v0.20240212.0"

0 commit comments

Comments
 (0)