ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also write stderr to file in Mono wrapper scripts

This commit is contained in:
YoshiRulz 2021-12-18 07:26:05 +10:00
parent b821012099
commit 6e73c6a5f1
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/EmuHawkMono.sh
View File

@ -25,7 +25,8 @@ export BIZHAWK_INT_SYSLIB_PATH="$libpath"
if [ "$1" = "--mono-no-redirect" ]; then if [ "$1" = "--mono-no-redirect" ]; then
shift shift
printf "(received --mono-no-redirect, stdout was not captured)\n" >EmuHawkMono_laststdout.txt printf "(received --mono-no-redirect, stdout was not captured)\n" >EmuHawkMono_laststdout.txt
printf "(received --mono-no-redirect, stderr was not captured)\n" >EmuHawkMono_laststderr.txt
mono ./EmuHawk.exe "$@" mono ./EmuHawk.exe "$@"
else else
mono ./EmuHawk.exe "$@" >EmuHawkMono_laststdout.txt mono ./EmuHawk.exe "$@" >EmuHawkMono_laststdout.txt 2>EmuHawkMono_laststderr.txt
fi fi

3
Dist/wrapper-scripts.nix
View File

@ -66,9 +66,10 @@ in rec {
if [ "$1" = "--mono-no-redirect" ]; then if [ "$1" = "--mono-no-redirect" ]; then
shift shift
printf "(received --mono-no-redirect, stdout was not captured)\n" >EmuHawkMono_laststdout.txt printf "(received --mono-no-redirect, stdout was not captured)\n" >EmuHawkMono_laststdout.txt
printf "(received --mono-no-redirect, stderr was not captured)\n" >EmuHawkMono_laststderr.txt
exec ${mono}/bin/mono $BIZHAWK_HOME/EmuHawk.exe --config=config.json "$@" exec ${mono}/bin/mono $BIZHAWK_HOME/EmuHawk.exe --config=config.json "$@"
else else
exec ${mono}/bin/mono $BIZHAWK_HOME/EmuHawk.exe --config=config.json "$@" >EmuHawkMono_laststdout.txt exec ${mono}/bin/mono $BIZHAWK_HOME/EmuHawk.exe --config=config.json "$@" >EmuHawkMono_laststdout.txt 2>EmuHawkMono_laststderr.txt
fi fi
''; '';
wrapperScriptNonNixOS = writeShellScriptBin "emuhawk-wrapper-non-nixos" '' wrapperScriptNonNixOS = writeShellScriptBin "emuhawk-wrapper-non-nixos" ''

2
README.md
View File

@ -210,7 +210,7 @@ $proc.Start()
On Linux, you can pass arguments to `EmuHawkMono.sh` as expected and they will be forwarded to `mono`. (You can also `export` env. vars.) All the arguments work as on Windows, with some caveats: On Linux, you can pass arguments to `EmuHawkMono.sh` as expected and they will be forwarded to `mono`. (You can also `export` env. vars.) All the arguments work as on Windows, with some caveats:
* file paths must be absolute (or relative to the install dir, `EmuHawkMono.sh` changes the CWD to there); * file paths must be absolute (or relative to the install dir, `EmuHawkMono.sh` changes the CWD to there);
* `--mono-no-redirect`: if you pass this flag *as the first argument*, it will be eaten by the script itself, and stdout will *not* be redirected to a file. (It's redirected by default.) * `--mono-no-redirect`: if you pass this flag *as the first argument*, it will be eaten by the script itself, and stdout/stderr will *not* be redirected to a file. (It's redirected by default.)
The same example as above would be `./EmuHawkMono.sh --lua=/path/to/script.lua /path/to/rom.n64`. The same example as above would be `./EmuHawkMono.sh --lua=/path/to/script.lua /path/to/rom.n64`.