Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fake reaper splitting arguments with spaces #66

Merged
merged 3 commits into from
Mar 22, 2024
Merged

Fix fake reaper splitting arguments with spaces #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3f3ebc
Fix fake reaper splitting input with spaces
loathingKernel Mar 20, 2024
64caafc
Use main repo version for reaper, since the module is tracked by the …
loathingKernel Mar 21, 2024
4b19aef
Fix packaging issues due to rename
loathingKernel Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile.in
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions umu/reaper
View file
Open in desktop
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
"$@"
R1kaB3rN marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions umu/umu_version.json.in
View file
Open in desktop
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