From a043dfcf6c65c7ca7e284932fa00d84e169b397a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:53:27 -0400 Subject: [PATCH] Update apps.json - reformat `apps.json` files - use `sed` to add required prefixes for flatpak build --- .../linux/flatpak/dev.lizardbyte.sunshine.yml | 8 ++++ src_assets/linux/assets/apps.json | 40 ++++++++++--------- src_assets/macos/assets/apps.json | 8 ++-- src_assets/windows/assets/apps.json | 25 ++++++------ 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml index d9e64a13..7bb4cd1b 100644 --- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml +++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml @@ -200,3 +200,11 @@ modules: url: '@GITHUB_CLONE_URL@' branch: '@GITHUB_BRANCH@' commit: '@GITHUB_COMMIT@' + post-install: + # use `sed` to update apps.json with prefixes required for flatpak + # -r (regex) + # -z (handle new lines) https://linuxhint.com/sed-replace-newline-with-space + # `/gm` global and multiline + - sed -r -z -i -e + 's/("((do)|(undo)|(cmd)|(detached))"\s*:\s*\[?\n*\s*")(.*")/\1flatpak-spawn --host \7/gm' + /app/share/sunshine/apps.json diff --git a/src_assets/linux/assets/apps.json b/src_assets/linux/assets/apps.json index 4a848bd8..927c7028 100644 --- a/src_assets/linux/assets/apps.json +++ b/src_assets/linux/assets/apps.json @@ -1,20 +1,24 @@ { - "env":{ - "PATH":"$(PATH):$(HOME)/.local/bin" - }, - "apps":[ - { - "name":"Low Res Desktop", - "prep-cmd":[ - { "do":"xrandr --output HDMI-1 --mode 1920x1080", "undo":"xrandr --output HDMI-1 --mode 1920x1200" } - ] - }, - { - "name":"Steam BigPicture", - - "output":"steam.txt", - "detached":["setsid steam steam://open/bigpicture"], - "image-path":"steam.png" - } - ] + "env": { + "PATH": "$(PATH):$(HOME)/.local/bin" + }, + "apps": [ + { + "name": "Low Res Desktop", + "prep-cmd": [ + { + "do": "xrandr --output HDMI-1 --mode 1920x1080", + "undo": "xrandr --output HDMI-1 --mode 1920x1200" + } + ] + }, + { + "name": "Steam BigPicture", + "output": "steam.txt", + "detached": [ + "setsid steam steam://open/bigpicture" + ], + "image-path": "steam.png" + } + ] } diff --git a/src_assets/macos/assets/apps.json b/src_assets/macos/assets/apps.json index 746c69b3..cb1c548a 100644 --- a/src_assets/macos/assets/apps.json +++ b/src_assets/macos/assets/apps.json @@ -1,6 +1,6 @@ { - "env":{ - "PATH":"$(PATH):$(HOME)/.local/bin" - }, - "apps":[ ] + "env": { + "PATH": "$(PATH):$(HOME)/.local/bin" + }, + "apps": [] } diff --git a/src_assets/windows/assets/apps.json b/src_assets/windows/assets/apps.json index 379dd2fb..de4847c3 100644 --- a/src_assets/windows/assets/apps.json +++ b/src_assets/windows/assets/apps.json @@ -1,14 +1,15 @@ { - "env":{ - "PATH":"$(PATH);C:\\Program Files (x86)\\Steam" - }, - "apps":[ - { - "name":"Steam BigPicture", - - "output":"steam.txt", - "detached":["steam steam://open/bigpicture"], - "image-path":"steam.png" - } - ] + "env": { + "PATH": "$(PATH);C:\\Program Files (x86)\\Steam" + }, + "apps": [ + { + "name": "Steam BigPicture", + "output": "steam.txt", + "detached": [ + "steam steam://open/bigpicture" + ], + "image-path": "steam.png" + } + ] }