Skip to content
Draft
Changes from all commits
Commits
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
28 changes: 26 additions & 2 deletions src/process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@
_app_prep_it = _app_prep_begin;

// Add Stream-specific environment variables
// These variables are dynamically set for each streaming session and will be passed
// to the launched application. They should be preserved during refresh() if an app is running.
_env["SUNSHINE_APP_ID"] = std::to_string(_app_id);
_env["SUNSHINE_APP_NAME"] = _app.name;
_env["SUNSHINE_CLIENT_WIDTH"] = std::to_string(launch_session->width);
Expand Down Expand Up @@ -751,8 +753,30 @@
void refresh(const std::string &file_name) {
auto proc_opt = proc::parse(file_name);

if (proc_opt) {
proc = std::move(*proc_opt);
if (!proc_opt) {
return;
}
// If it is running, the environment variable (SUNSHINE_*) should be kept.
// These variables are dynamically added in execute() and should not be

Check failure on line 760 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

code should be clang-formatted
// overridden by environment variables in the configuration file
if (proc.running()) {
const boost::process::v1::environment &current_env = proc.get_env();

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'get_env' in 'proc::proc_t'

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 763 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)
boost::process::v1::environment new_env = proc_opt->get_env();

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

code should be clang-formatted

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'get_env' in 'proc::proc_t'

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 764 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

// Copy the 'SUNSHINE_*' from the current environment into the new environment.
for (const auto &entry : current_env) {
const std::string &var_name = entry.get_name();
if (var_name.find("SUNSHINE_") == 0) {
new_env[var_name] = entry.to_string();
}
}

Check failure on line 772 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

code should be clang-formatted

proc.set_env(std::move(new_env));

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'set_env' in 'proc::proc_t'

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 774 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)
}

Check failure on line 775 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Common Lint / Common Lint

code should be clang-formatted
else {
// Not a running state, which can safely replace environment variables
proc.set_env(proc_opt->get_env());

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'get_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'get_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'get_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'set_env' in 'proc::proc_t'

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'get_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'set_env'; did you mean 'boost::process::v1::environment proc::proc_t::_env'? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘get_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)

Check failure on line 778 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘set_env’; did you mean ‘boost::process::v1::environment proc::proc_t::_env’? (not accessible from this context)
}
proc.set_apps(proc_opt->get_apps());

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-24.04

'class proc::proc_t' has no member named 'set_apps'; did you mean 'get_apps'?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-26

no member named 'set_apps' in 'proc::proc_t'

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-14

no member named 'set_apps' in 'proc::proc_t'

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Windows / Windows-AMD64

'class proc::proc_t' has no member named 'set_apps'; did you mean 'get_apps'?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / macos-15

no member named 'set_apps' in 'proc::proc_t'

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux / AppImage

‘class proc::proc_t’ has no member named ‘set_apps’; did you mean ‘get_apps’?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-debian-trixie

'class proc::proc_t' has no member named 'set_apps'; did you mean 'get_apps'?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Docker / Docker-ubuntu-22.04

'class proc::proc_t' has no member named 'set_apps'; did you mean 'get_apps'?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / aarch64

‘class proc::proc_t’ has no member named ‘set_apps’; did you mean ‘get_apps’?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Flatpak / x86_64

‘class proc::proc_t’ has no member named ‘set_apps’; did you mean ‘get_apps’?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Homebrew / ubuntu-22.04

'class proc::proc_t' has no member named 'set_apps'; did you mean 'get_apps'?

Check failure on line 780 in src/process.cpp

View workflow job for this annotation

GitHub Actions / Linux Copr / call-copr-ci / Copr build

‘class proc::proc_t’ has no member named ‘set_apps’; did you mean ‘get_apps’?
}
} // namespace proc
Loading