From 1cf365206adf60f16b670d9af2facedcf02dda0d Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 12 Nov 2012 17:19:31 +0000 Subject: [PATCH] Make (nearly all) argument values canonical by wrapping them in double quotation marks. This avoids potential problems with spaces in paths, and sets a good example for anyone who is writing a new script. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@46032 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/s/Startup-Sequence | 282 +++++++++++++++++++++---------------------- 1 file changed, 141 insertions(+), 141 deletions(-) rewrite workbench/s/Startup-Sequence (80%) diff --git a/workbench/s/Startup-Sequence b/workbench/s/Startup-Sequence dissimilarity index 80% index 82a7699861..54d8d99fd8 100644 --- a/workbench/s/Startup-Sequence +++ b/workbench/s/Startup-Sequence @@ -1,141 +1,141 @@ -SetClock LOAD - -FailAt 21 - -Makedir RAM:Clipboards -If NOT EXISTS RAM:T - Makedir RAM:T -EndIf -If NOT EXISTS RAM:ENV - Makedir RAM:ENV - Assign ENV: RAM:ENV -EndIf - -Assign T: RAM:T -Assign CLIPS: RAM:Clipboards - -Assign KEYMAPS: DEVS:Keymaps -Assign LOCALE: SYS:Locale -Assign LIBS: SYS:Classes ADD -Assign FONTS: SYS:Fonts -Assign HELP: LOCALE:Help DEFER -Assign THEMES: SYS:System/Themes >NIL: -Assign IMAGES: SYS:System/Images DEFER -;Assign PRINTERS: DEVS:Printers -Assign WANDERER: SYS:System/Wanderer DEFER - -If EXISTS SYS:Classes/USB - Assign USBCLASSES: SYS:Classes/USB - AddUSBClasses >NIL: -EndIf - -If EXISTS SYS:DiskImages - Assign FDSK: SYS:DiskImages -EndIf - -Automount >NIL: -Mount >NIL: DEVS:DOSDrivers/~((.#?)|(#?.info)) - -Dir >NIL: PIPE: - -Path C: SYS:System S: SYS:Prefs SYS:Tools SYS:Utilities QUIET - -If EXISTS SYS:Tools/Commodities - Path SYS:Tools/Commodities QUIET ADD -EndIf - -If EXISTS SYS:Demos - Path SYS:Demos ADD QUIET -EndIf - -If EXISTS Sys:Rexxc - Path Sys:Rexxc ADD QUIET -Endif - -Copy >NIL: ENVARC: ENV: ALL NOPRO NOREQ PAT ~(def_#?.info) - -If EXISTS ENV:SYS/theme.var - Assign THEME: ${SYS/theme.var} -else - Assign THEME: THEMES:OS3.1/ -endif - -Touch >NIL: FONTS:__TEST__ -If WARN - Makedir RAM:Fonts - Assign FONTS: RAM:Fonts - Copy >NIL: SYS:Fonts FONTS: ALL CLONE NOREQ -Endif -Assign >NIL: FONTS: FONTS:Russian ADD - -IF EXISTS FONTS:__TEST__ - Delete FONTS:__TEST__ QUIET -Endif - -If NOT EXISTS FONTS:fixed.font - FixFonts -EndIf - -AddDatatypes REFRESH QUIET -IPrefs -Run NIL: QUIET ConClip - -If EXISTS C:RexxMast - Assign REXX: S: - Run NIL: QUIET C:RexxMast -EndIf - -If EXISTS C:Decoration - If EXISTS ENV:SYS/theme.var - C:Decoration NIL: - If EXISTS THEME:global.prefs - If EXISTS ENV:Zune/usethemeprefs - Copy >NIL: THEME:global.prefs ENV:Zune/ NOPRO NOREQ FORCEOVERWRITE - EndIf - EndIf - EndIf -Endif - -Assign EXISTS Extras: >NIL: -If WARN - If Exists $EXTRASPATH - Assign Extras: $EXTRASPATH - Else - Assign Extras: SYS:Extras >NIL: - If WARN - Assign Extras: NIL: >NIL: - EndIf - EndIf -Endif - -Assign EXISTS Development: >NIL: -If WARN - If Exists $DEVELPATH - Assign Development: $DEVELPATH - EndIf -Endif -Assign EXISTS Development: >NIL: -If WARN - Assign Development: SYS:Development >NIL: -EndIf - - -If EXISTS ENV:SYS/Packages - List ENV:SYS/Packages NOHEAD FILES TO T:P LFORMAT="If EXISTS ${SYS/Packages/%N}*NCD ${SYS/Packages/%N}*NIf EXISTS S/Package-Startup*NExecute S/Package-Startup*NEndif*NEndif*N" - Execute T:P - Delete T:P QUIET - CD SYS: -EndIf - -Protect S:PCD s ADD QUIET -Protect S:SPat s ADD QUIET - -If EXISTS S:User-Startup - Execute S:User-Startup -EndIf - -WANDERER:Wanderer - -If NOT ERROR - EndCLI -EndIf +SetClock LOAD + +FailAt 21 + +Makedir "RAM:Clipboards" +If NOT EXISTS "RAM:T" + Makedir "RAM:T" +EndIf +If NOT EXISTS "RAM:ENV" + Makedir "RAM:ENV" + Assign "ENV:" "RAM:ENV" +EndIf + +Assign "T:" "RAM:T" +Assign "CLIPS:" "RAM:Clipboards" + +Assign "KEYMAPS:" "DEVS:Keymaps" +Assign "LOCALE:" "SYS:Locale" +Assign "LIBS:" "SYS:Classes" ADD +Assign "FONTS:" "SYS:Fonts" +Assign "HELP:" "LOCALE:Help" DEFER +Assign "THEMES:" "SYS:System/Themes" >NIL: +Assign "IMAGES:" "SYS:System/Images" DEFER +;Assign "PRINTERS:" "DEVS:Printers" +Assign "WANDERER:" "SYS:System/Wanderer" DEFER + +If EXISTS "SYS:Classes/USB" + Assign "USBCLASSES:" "SYS:Classes/USB" + AddUSBClasses >NIL: +EndIf + +If EXISTS "SYS:DiskImages" + Assign "FDSK:" "SYS:DiskImages" +EndIf + +Automount >NIL: +Mount >NIL: "DEVS:DOSDrivers/~((.#?)|(#?.info))" + +Dir >NIL: "PIPE:" + +Path "C:" "SYS:System" "S:" "SYS:Prefs" "SYS:Tools" "SYS:Utilities" QUIET + +If EXISTS "SYS:Tools/Commodities" + Path "SYS:Tools/Commodities" QUIET ADD +EndIf + +If EXISTS "SYS:Demos" + Path "SYS:Demos" ADD QUIET +EndIf + +If EXISTS "Sys:RexxC" + Path "Sys:RexxC" ADD QUIET +Endif + +Copy >NIL: "ENVARC:" "ENV:" ALL NOPRO NOREQ PAT "~(def_#?.info)" + +If EXISTS "ENV:SYS/theme.var" + Assign "THEME:" "${SYS/theme.var}" +else + Assign "THEME:" "THEMES:OS3.1/" +endif + +Touch >NIL: "FONTS:__TEST__" +If WARN + Makedir "RAM:Fonts" + Assign "FONTS:" "RAM:Fonts" + Copy >NIL: "SYS:Fonts" "FONTS:" ALL CLONE NOREQ +Endif +Assign >NIL: "FONTS:" "FONTS:Russian" ADD + +IF EXISTS "FONTS:__TEST__" + Delete "FONTS:__TEST__" QUIET +Endif + +If NOT EXISTS "FONTS:fixed.font" + FixFonts +EndIf + +AddDatatypes REFRESH QUIET +IPrefs +Run NIL: QUIET ConClip + +If EXISTS "C:RexxMast" + Assign "REXX:" "S:" + Run NIL: QUIET C:RexxMast +EndIf + +If EXISTS "C:Decoration" + If EXISTS "ENV:SYS/theme.var" + C:Decoration NIL: + If EXISTS "THEME:global.prefs" + If EXISTS "ENV:Zune/usethemeprefs" + Copy >NIL: "THEME:global.prefs" "ENV:Zune/" NOPRO NOREQ FORCEOVERWRITE + EndIf + EndIf + EndIf +Endif + +Assign EXISTS "Extras:" >NIL: +If WARN + If EXISTS "$EXTRASPATH" + Assign "Extras:" "$EXTRASPATH" + Else + Assign "Extras:" "SYS:Extras" >NIL: + If WARN + Assign "Extras:" "NIL:" >NIL: + EndIf + EndIf +Endif + +Assign EXISTS "Development:" >NIL: +If WARN + If EXSITS "$DEVELPATH" + Assign "Development:" "$DEVELPATH" + EndIf +Endif +Assign EXISTS "Development:" >NIL: +If WARN + Assign "Development:" "SYS:Development" >NIL: +EndIf + + +If EXISTS "ENV:SYS/Packages" + List "ENV:SYS/Packages" NOHEAD FILES TO "T:P" LFORMAT="If EXISTS ${SYS/Packages/%N}*NCD ${SYS/Packages/%N}*NIf EXISTS S/Package-Startup*NExecute S/Package-Startup*NEndif*NEndif*N" + Execute "T:P" + Delete "T:P" QUIET + CD "SYS:" +EndIf + +Protect "S:PCD" "s" ADD QUIET +Protect "S:SPat" "s" ADD QUIET + +If EXISTS "S:User-Startup" + Execute "S:User-Startup" +EndIf + +WANDERER:Wanderer + +If NOT ERROR + EndCLI +EndIf -- 2.11.4.GIT