From 668820e018218b8544e35fbb569008f8a4bf1beb Mon Sep 17 00:00:00 2001
From: Cameron Cawley
Date: Thu, 28 Feb 2019 20:49:17 +0000
Subject: RISCOS: Don't expand system variables passed via the command line

---
 dists/riscos/!Run,feb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'dists/riscos')

diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index be6046ed6a..8def7f7fa4 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -6,8 +6,13 @@ RMEnsure SharedUnixLibrary 1.14 Error ScummVM requires SharedUnixLibrary 1.14 or
 RMEnsure DigitalRenderer 0.56 RMLoad System:Modules.DRenderer
 RMEnsure DigitalRenderer 0.56 Error ScummVM requires DigitalRenderer 0.56 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#DRenderer
 
-Set ScummVM$stdout ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr
-If "<Wimp$State>"="commands" Then Unset ScummVM$stdout Else CDir <Choices$Write>.ScummVM
+| If running from the desktop, redirect stdout and stderr to a file.
+| This shouldn't happen when running from the command line, so that commands like "<ScummVM$Dir> --help" still work as expected.
+Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr
+If "<Wimp$State>"="commands" Then Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0
+CDir <Choices$Write>.ScummVM
 
 |WimpSlot
-Do Run <ScummVM$Dir>.scummvm %*0 <ScummVM$stdout>
+Run_ScummVM %*0
+
+Unset Alias$Run_ScummVM
-- 
cgit v1.2.3