clearlinux/linux-steam-integration
2
0
Fork 0
mirror of https://github.com/clearlinux/linux-steam-integration.git synced 2026-10-03 15:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

shim: Launch vanilla /usr/bin/steam when replacement is disabled

Browse Source 
When we're not built for distro integration, we'll now call out to
/usr/bin/steam with the LSI modifications in place, so that we don't
enter into an infinite recursion.

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
This commit is contained in:
Ikey Doherty
2016-12-08 23:54:20 +00:00
parent 2282296045
commit dd5237e648
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+3
View File
@@ -89,6 +89,9 @@ AC_ARG_ENABLE(replace-steam, AS_HELP_STRING([--disable-replace-steam], [disable
if test "x$enable_replace_steam" = "xno"; then
replace_steam="no"
fi
if test "x$replace_steam" = "xyes" ; then
AC_DEFINE([REPLACE_STEAM], [1], [Steam binary will be replaced])
fi
AM_CONDITIONAL([REPLACE_STEAM], [test x$replace_steam = "xyes"])
AC_OUTPUT
src/shim/shim.c
+13 -6
View File
@@ -32,10 +32,17 @@ int main(int argc, char **argv)
bool is_x86_64;
const char *n_argv[argc + 2];
const char *exec_command = NULL;
/* Use the appropriate Steam depending on configuration */
const char *lsi_exec_bin = NULL;
int i = 1;
int8_t off = 0;
int (*vfunc)(const char *, char *const argv[]) = NULL;
#ifdef REPLACE_STEAM
lsi_exec_bin = STEAM_BINARY;
#else
lsi_exec_bin = "/usr/bin/steam";
#endif
/* Initialise config */
if (!lsi_config_load(&config)) {
lsi_config_load_defaults(&config);
@@ -43,8 +50,8 @@ int main(int argc, char **argv)
is_x86_64 = lsi_system_is_64bit();
if (!lsi_file_exists(STEAM_BINARY)) {
lsi_report_failure("Steam isn't currently installed at %s", STEAM_BINARY);
if (!lsi_file_exists(lsi_exec_bin)) {
lsi_report_failure("Steam isn't currently installed at %s", lsi_exec_bin);
return EXIT_FAILURE;
}
@@ -70,14 +77,14 @@ int main(int argc, char **argv)
if (config.force_32 && is_x86_64) {
exec_command = EMUL32BIN;
n_argv[0] = EMUL32BIN;
n_argv[1] = STEAM_BINARY;
n_argv[1] = lsi_exec_bin;
off = 1;
/* Use linux32 in the path */
vfunc = execvp;
} else {
/* Directly call STEAM_BINARY */
exec_command = STEAM_BINARY;
n_argv[0] = STEAM_BINARY;
/* Directly call lsi_exec_bin */
exec_command = lsi_exec_bin;
n_argv[0] = lsi_exec_bin;
/* Full path here due to shadow nature */
vfunc = execv;
}