Skip to content

Commit

Permalink
Fix fake reaper splitting arguments with spaces (#66)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
loathingKernel authored Mar 22, 2024
1 parent 76bc4ed commit caa5daa
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 191 deletions.
6 changes: 3 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ endif
umu/umu_version.json: umu/umu_version.json.in
$(info :: Updating $(@) )
cp $(<) $(<).tmp
sed 's|##umu_version##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
sed 's|##REAPER_VERSION##|$(shell git -C subprojects/reaper describe --always --long --tags)|g' -i $(<).tmp
sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
sed 's|##REAPER_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
mv $(<).tmp $(@)

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


Expand Down
183 changes: 0 additions & 183 deletions flatpak/org.openwinecomponents.umu.launcher.yml

This file was deleted.

8 changes: 5 additions & 3 deletions umu/reaper
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env sh
# Fake reaper file to avoid errors while running from source
args="$*"
cmd=${args#* -- }
$cmd
while [ "$1" != "--" ]; do
shift
done
shift
"$@"
4 changes: 2 additions & 2 deletions umu/umu_version.json.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"umu": {
"versions": {
"launcher": "##umu_version##",
"runner": "##umu_version##",
"launcher": "##UMU_VERSION##",
"runner": "##UMU_VERSION##",
"runtime_platform": "sniper_platform_0.20240125.75305",
"reaper": "##REAPER_VERSION##",
"pressure_vessel": "v0.20240212.0"
Expand Down

0 comments on commit caa5daa

Please sign in to comment.