RISC OS: fix the worst of the !Cache badness.

This commit is contained in:
John-Mark Bell 2015-02-28 19:06:38 +00:00
parent 74e2c86555
commit 21cf3d6186
2 changed files with 22 additions and 9 deletions

View File

@ -1,3 +1,17 @@
Set Cache$FromBoot True
If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run
Unset Cache$FromBoot
If (("<Cache$AppDir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$AppDir <Obey$Dir>
IconSprites <Cache$AppDir>.!Sprites
| Find and set up resource paths
WimpSlot -min 64k -max 64k
Run <Cache$AppDir>.Resources.ResFind CacheApp
If (("<Cache$Meta>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Meta CacheAppRes:!Meta
| Work out where the cache directory should be -- use Choices$User if set or Default, otherwise.
Set Cache$Suffix "<Choices$User>"
If "<Cache$Suffix>" = "" Then Set Cache$Suffix "Default"
If (("<Cache$Dir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Dir "<Cache$AppDir>.Caches.<Cache$Suffix>"
Unset Cache$Suffix
| Ensure cache directory exists (sadly, unavoidable)
CDir <Cache$Dir>

View File

@ -1,10 +1,9 @@
Set Cache$AppDir <Obey$Dir>
IconSprites <Cache$AppDir>.!Sprites
Run <Cache$AppDir>.Resources.ResFind CacheApp
Set Cache$Meta CacheAppRes:!Meta
Set Cache$ForceVars 1
Run <Obey$Dir>.!Boot
Unset Cache$ForceVars
RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run
RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True"
Run <Cache$AppDir>.!RunImage
Wimpslot -min 128k -max 128k
Run <Cache$AppDir>.!RunImage