Changeset 253


Ignore:
Timestamp:
Aug 16, 2005, 5:21:40 PM (20 years ago)
Author:
root
Message:

Add JFSOPT support
Ensure folder icon gets updated

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/install.cmd

    r234 r253  
    1 /****************************************************************************
    2  *                        FM/2 installation program                         *
    3  *                                                                          *
    4  * This program creates folders to hold program and data objects,           *
    5  * then creates program objects for each executable.  It only needs to be   *
    6  * run once (unless you move the FM/2 directory -- see say notes at end).   *
    7  * Run this program in the FM/2 directory (where you unpacked the archive). *
    8  *                                                                          *
    9  * Note that if you place the FM/2 Utilities package into a directory named *
    10  * UTILS off of the FM/2 directory, this install program will create some   *
    11  * objects for you for some of those programs.                              *
    12  *                                                                          *
    13  * For unattended installation, call with /UNATTENDED as the first          *
    14  * argument.                                                                *
    15  *                                                                          *
    16  * To avoid any WPS associations being set, use the /NOASSOC argument.      *
    17  *                                                                          *
    18  * For usage help, run as INSTALL /?                                        *
    19  *                                                                          *
    20  * $Id$                    *
    21  ****************************************************************************/
     1/* install - FM/2 installation program
     2   $Id$
     3
     4   Copyright (c) 1993, 1998 M. Kimes
     5   Copyright (c) 2002, 2005 Steven Levine and Associates, Inc.
     6   All rights reserved.
     7
     8   This program is free software licensed under the terms of the GNU
     9   General Public License.  The GPL Software License can be found in
     10   gnugpl2.txt or at http://www.gnu.org/licenses/licenses.html#GPL
     11
     12   08 Aug 05 SHL Add JFSOPT support
     13   16 Aug 05 SHL Ensure folder icon gets updated
     14
     15*/
    2216
    2317/* Identify ourself */
    … …  
    3024say'     ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ'
    3125
     26/* check arguments and adjust as required */
     27
    3228assocfilter = ';ASSOCFILTER=*.ZIP,*.ARC,*.LZH,*.ARJ,*.ZOO,*.MO0,READ.ME,README,README.1ST,README.OS2,REGISTER.TXT'
    33 
    34 /* check arguments and adjust as required */
    35 
    36 parse upper arg dummy1 dummy2
    37 if dummy1 = '/NOASSOC' then assocfilter = ''
    38 if dummy2 = '/NOASSOC' then assocfilter = ''
     29attended = 1
     30
     31parse upper arg tail
     32do while tail \= ''
     33  parse var tail curarg tail
     34  curarg = strip(curarg)
     35  /* if user asked for usage help, give it */
     36  if curarg = '/?' then do
     37    say ''
     38    say 'Usage:  INSTALL [/NOASSOC] [/UNATTENDED]'
     39    say ''
     40    say ' /NOASSOC             don''t set any WPS associations for FM/2 programs.'
     41    say ' /UNATTENDED          don''t ask any questions; run without stopping.'
     42    say ''
     43    say 'Examples:'
     44    say ' INSTALL'
     45    say ' INSTALL /NOASSOC'
     46    say ' INSTALL /UNATTENDED'
     47    say ' INSTALL /NOASSOC /UNATTENDED'
     48    exit
     49  end
     50  if curarg = '/NOASSOC' then assocfilter = ''
     51  if curarg = '/UNATTENDED' then attended = 0
     52end
     53
    3954if assocfilter = '' then say '     /NOASSOC = TRUE'
    40 
    41 if dummy1 = '/UNATTENDED' then unattended = ''
    42 if dummy2 = '/UNATTENDED' then unattended = ''
    43 if unattended = '' then say '     /UNATTENDED = TRUE'
    44 
    45 /* if user asked for usage help, give it */
    46 
    47 if dummy1 = '/?' | dummy2 = '/?' then
    48 do
    49   say ''
    50   say 'Usage:  INSTALL [/NOASSOC] [/UNATTENDED]'
    51   say ''
    52   say ' /NOASSOC             don''t set any WPS associations for FM/2 programs.'
    53   say ' /UNATTENDED          don''t ask any questions; run without stopping.'
    54   say ''
    55   say 'Examples:'
    56   say ' INSTALL'
    57   say ' INSTALL /NOASSOC'
    58   say ' INSTALL /UNATTENDED'
    59   say ' INSTALL /NOASSOC /UNATTENDED'
    60   exit
    61 end
     55if attended = 0 then say '     /UNATTENDED = TRUE'
    6256
    6357/* see if we might be in the right directory... */
    … …  
    8478/* give user a chance to hit CTRL-C */
    8579
    86 if unattended = 'UNATTENDED' then
    87 do
     80if attended then do
    8881  call charout ,'  Press [Enter] to continue...'
    89   dummy = ''
    90   do until dummy = '0d'x
    91     dummy = SysGetKey('NOECHO')
     82  ans = ''
     83  do until ans = '0d'x
     84    ans = SysGetKey('NOECHO')
    9285  end
    9386  call charout ,'0d1b'x'[K'
    … …  
    10295say "Creating File Manager/2 folders and objects..."
    10396
    104 /* first, create FM/2 folder */
     97/* first, try to create FM/2 folder, fail if exists */
    10598
    10699title = "File Manager/2"
    … …  
    113106if rc \= '' then setup = setup'ICONNFILE=1,'rc';'
    114107setup = setup'OBJECTID=<FM3_Folder>'
    115 result = SysCreateObject(classname,title,location,setup,f)
     108
     109created = SysCreateObject(classname,title,location,setup,'f')
     110
     111if attended then do
     112  if \ created then do
     113    say
     114    say 'The File Manager/2 folder already exists.'
     115    call charout ,"Should I update the objects (it's painless)? (Y/N) "
     116    ans = ''
     117    do forever
     118      ans = SysGetKey('NOECHO')
     119      parse upper var ans ans
     120      if ans = '1b'x then ans = 'N'
     121      if ans = '0d'x then ans = 'Y'
     122      if ans = 'N' then leave
     123      if ans = 'Y' then leave
     124      call beep 262,10
     125    end
     126    call charout ,ans
     127    say
     128    if ans = 'N' then exit
     129  end
     130end
     131else do
     132  /* Unattended */
     133  if \ created then
     134    say 'Updating objects.'
     135end
     136
     137if \ created then do
     138  /* Ensure icons get updated */
     139  call SysCreateObject classname,title,location,setup,'u'
     140  /* Suppress assoc filter updates */
     141  assocfilter = ''
     142end
     143
    116144'DEL FM2FLDR.ICO 1>NUL 2>NUL'
    117145'DEL FM2FLDR2.ICO 1>NUL 2>NUL'
    118146
    119 if unattended = 'UNATTENDED' then
    120 do
    121   if result = 0 then
    122   do
    123     assocfilter = ''
    124     existed = ''
    125     say ''
    126     say 'The File Manager/2 folder already exists.'
    127     call charout ,"Should I update the objects (it's painless)? (Y/N) "
    128     dummy = ''
    129     do forever
    130       dummy = SysGetKey('NOECHO')
    131       parse upper var dummy dummy
    132       if dummy = '1b'x then dummy = 'N'
    133       if dummy = '0d'x then dummy = 'Y'
    134       if dummy = 'N' then leave
    135       if dummy = 'Y' then leave
    136       call beep 262,10
    137     end
    138     call charout ,dummy
    139     say ''
    140     if dummy = 'N' then exit
    141   end
    142 end
    143 else
    144 do
    145   if result = 0 then
    146   do
    147     assocfilter = ''
    148     existed = ''
    149     say 'Updating objects.'
    150   end
    151 end
    152 
    153 /* create objects in appropriate folders */
     147/* create objects in appropriate folders, retain settings if folder not created */
    154148
    155149rc = stream('fm3.exe','c','query exists')
    … …  
    160154  location = '<FM3_Folder>'
    161155  setup = 'EXENAME='rc';STARTUPDIR='curdir
    162   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     156  if created then setup = setup';PARAMETERS=%*'
    163157  setup = setup';OBJECTID=<FM/2>'
    164   call SysCreateObject classname,title,location,setup,u
     158  call SysCreateObject classname,title,location,setup,'u'
    165159end
    166160
    … …  
    172166  location = '<FM3_Folder>'
    173167  setup = 'EXENAME='rc';STARTUPDIR='curdir
    174   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     168  if created then setup = setup';PARAMETERS=%*'
    175169  setup = setup';OBJECTID=<FM/2 LITE>'
    176   call SysCreateObject classname,title,location,setup,u
     170  call SysCreateObject classname,title,location,setup,'u'
    177171end
    178172
    … …  
    187181if rc \= '' then setup = setup'ICONNFILE=1,'rc';'
    188182setup = setup'OBJECTID=<FM3_Tools>'
    189 result = SysCreateObject(classname,title,location,setup,u)
     183result = SysCreateObject(classname,title,location,setup,'u')
    190184'DEL TOOLBOX.ICO 1>NUL 2>NUL'
    191185'DEL TOOLBOX2.ICO 1>NUL 2>NUL'
    … …  
    201195if rc \= '' then setup = setup'ICONNFILE=1,'rc';'
    202196setup = setup'OBJECTID=<FM3_Docs>'
    203 result = SysCreateObject(classname,title,location,setup,u)
     197result = SysCreateObject(classname,title,location,setup,'u')
    204198'DEL DOCS.ICO 1>NUL 2>NUL'
    205199'DEL DOCS2.ICO 1>NUL 2>NUL'
    … …  
    212206  location = '<FM3_Tools>'
    213207  setup = 'EXENAME='rc';STARTUPDIR='curdir''assocfilter
    214   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     208  if created then setup = setup';PARAMETERS=%*'
    215209  setup = setup';OBJECTID=<FM/2_AV/2>'
    216   call SysCreateObject classname,title,location,setup,u
     210  call SysCreateObject classname,title,location,setup,'u'
    217211end
    218212
    … …  
    224218  location = '<FM3_Tools>'
    225219  setup = 'EXENAME='rc';STARTUPDIR='curdir
    226   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     220  if created then setup = setup';PARAMETERS=%*'
    227221  setup = setup';OBJECTID=<FM/2_EAVIEW>'
    228   call SysCreateObject classname,title,location,setup,u
     222  call SysCreateObject classname,title,location,setup,'u'
    229223end
    230224
    … …  
    237231  location = '<FM3_Tools>'
    238232  setup = 'EXENAME='rc';STARTUPDIR='curdir
    239   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     233  if created then setup = setup';PARAMETERS=%*'
    240234  setup = setup';OBJECTID=<FM/2_IMAGEVIEW>'
    241   call SysCreateObject classname,title,location,setup,u
     235  call SysCreateObject classname,title,location,setup,'u'
    242236end
    243237
    … …  
    249243  location = '<FM3_Tools>'
    250244  setup = 'EXENAME='rc';STARTUPDIR='curdir
    251   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     245  if created then setup = setup';PARAMETERS=%*'
    252246  setup = setup';OBJECTID=<FM/2_DIRSIZE>'
    253   call SysCreateObject classname,title,location,setup,u
     247  call SysCreateObject classname,title,location,setup,'u'
    254248end
    255249
    … …  
    262256  location = '<FM3_Tools>'
    263257  setup = 'EXENAME='rc';STARTUPDIR='curdir''assocfilter
    264   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     258  if created then setup = setup';PARAMETERS=%*'
    265259  setup = setup';OBJECTID=<FM/2_INIVIEW>'
    266   call SysCreateObject classname,title,location,setup,u
     260  call SysCreateObject classname,title,location,setup,'u'
    267261end
    268262
    … …  
    274268  location = '<FM3_Tools>'
    275269  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_BOOKSHELF>'
    276   call SysCreateObject classname,title,location,setup,u
     270  call SysCreateObject classname,title,location,setup,'u'
    277271  title = "Helpfile Viewer"
    278272  classname = 'WPProgram'
    279273  location = '<FM3_Tools>'
    280274  setup = 'EXENAME='rc';PARAMETERS=DUMMY;STARTUPDIR='curdir
    281   call SysCreateObject classname,title,location,setup,u
     275  call SysCreateObject classname,title,location,setup,'u'
    282276end
    283277
    … …  
    289283  location = '<FM3_Tools>'
    290284  setup = 'EXENAME='rc';PARAMETERS=%;STARTUPDIR='curdir';OBJECTID=<FM/2_KILLPROC>'
    291   call SysCreateObject classname,title,location,setup,u
     285  call SysCreateObject classname,title,location,setup,'u'
    292286end
    293287
    … …  
    299293  location = '<FM3_Tools>'
    300294  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_UNDEL>'
    301   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
    302   call SysCreateObject classname,title,location,setup,u
     295  if created then setup = setup';PARAMETERS=%*'
     296  call SysCreateObject classname,title,location,setup,'u'
    303297end
    304298
    … …  
    310304  location = '<FM3_Tools>'
    311305  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_VTREE>'
    312   call SysCreateObject classname,title,location,setup,u
     306  call SysCreateObject classname,title,location,setup,'u'
    313307end
    314308
    … …  
    320314  location = '<FM3_Tools>'
    321315  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_VDIR>'
    322   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
    323   call SysCreateObject classname,title,location,setup,u
     316  if created then setup = setup';PARAMETERS=%*'
     317  call SysCreateObject classname,title,location,setup,'u'
    324318end
    325319
    … …  
    331325  location = '<FM3_Tools>'
    332326  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_VCOLLECT>'
    333   call SysCreateObject classname,title,location,setup,u
     327  call SysCreateObject classname,title,location,setup,'u'
    334328  title = "Seek and scan"
    335329  classname = 'WPProgram'
    336330  location = '<FM3_Tools>'
    337331  setup = 'EXENAME='rc';PARAMETERS=**;STARTUPDIR='curdir';OBJECTID=<FM/2_VSEEK>'
    338   call SysCreateObject classname,title,location,setup,u
     332  call SysCreateObject classname,title,location,setup,'u'
    339333end
    340334
    … …  
    346340  location = '<FM3_Tools>'
    347341  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_SEEALL>'
    348   call SysCreateObject classname,title,location,setup,u
     342  call SysCreateObject classname,title,location,setup,'u'
    349343end
    350344
    … …  
    356350  location = '<FM3_Tools>'
    357351  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_DATABAR>'
    358   call SysCreateObject classname,title,location,setup,u
     352  call SysCreateObject classname,title,location,setup,'u'
    359353end
    360354
    … …  
    367361  location = '<FM3_Tools>'
    368362  setup = 'EXENAME='rc';STARTUPDIR='curdir';OBJECTID=<FM/2_SYSINFO>'
    369   call SysCreateObject classname,title,location,setup,u
     363  call SysCreateObject classname,title,location,setup,'u'
    370364end
    371365*/
    … …  
    383377  location = '<FM3_Tools>'
    384378  setup = 'EXENAME='rc';OBJECTID=<FM/2_FM2PLAY>;PARAMETERS=/! %*'
    385   call SysCreateObject classname,title,location,setup,u
     379  call SysCreateObject classname,title,location,setup,'u'
    386380end
    387381
    … …  
    394388  location = '<FM3_Tools>'
    395389  setup = 'EXENAME='rc';STARTUPDIR='curdir
    396   if existed = 'EXISTED' then setup = setup';PARAMETERS=%*'
     390  if created then setup = setup';PARAMETERS=%*'
    397391  setup = setup';OBJECTID=<FM/2_MAKEARC>'
    398   call SysCreateObject classname,title,location,setup,u
     392  call SysCreateObject classname,title,location,setup,'u'
    399393end
    400394
    … …  
    406400  location = '<FM3_Docs>'
    407401  setup = 'SHADOWID='rc
    408   call SysCreateObject classname,title,location,setup,u
     402  call SysCreateObject classname,title,location,setup,'u'
    409403end
    410404
    … …  
    416410  location = '<FM3_Docs>'
    417411  setup = 'EXENAME='VIEW.EXE';STARTUPDIR='curdir';PARAMETERS='curdir'\FM3.HLP'
    418   call SysCreateObject classname,title,location,setup,u
     412  call SysCreateObject classname,title,location,setup,'u'
    419413end
    420414
    … …  
    426420  location = '<FM3_Tools>'
    427421  setup = 'EXENAME='rc';PARAMETERS=%*'
    428   call SysCreateObject classname,title,location,setup,u
     422  call SysCreateObject classname,title,location,setup,'u'
    429423end
    430424
    … …  
    436430  location = '<FM3_Docs>'
    437431  setup = 'SHADOWID='rc
    438   call SysCreateObject classname,title,location,setup,u
     432  call SysCreateObject classname,title,location,setup,'u'
    439433end
    440434
    … …  
    554548      if rc \= '' then
    555549      do
    556         rc = stream('SORT.TMP','c','query exists')
    557         if rc \= '' then
    558         do
    559           rc = stream('SELECT.TMP','c','query exists')
    560           if rc \= '' then
    561           do
    562             say 'Creating a sample QUICKTLS.DAT file and toolboxes for you.'
    563             'REN QUICKTLS.TMP QUICKTLS.DAT 1>NUL 2>NUL'
    564             'REN CMDS.TMP CMDS.TLS 1>NUL 2>NUL'
    565             'REN UTILS.TMP UTILS.TLS 1>NUL 2>NUL'
    566             'REN SORT.TMP SORT.TLS 1>NUL 2>NUL'
    567             'REN SELECT.TMP SELECT.TLS 1>NUL 2>NUL'
    568           end
    569         end
     550        rc = stream('SORT.TMP','c','query exists')
     551        if rc \= '' then
     552        do
     553          rc = stream('SELECT.TMP','c','query exists')
     554          if rc \= '' then
     555          do
     556            say 'Creating a sample QUICKTLS.DAT file and toolboxes for you.'
     557            'REN QUICKTLS.TMP QUICKTLS.DAT 1>NUL 2>NUL'
     558            'REN CMDS.TMP CMDS.TLS 1>NUL 2>NUL'
     559            'REN UTILS.TMP UTILS.TLS 1>NUL 2>NUL'
     560            'REN SORT.TMP SORT.TLS 1>NUL 2>NUL'
     561            'REN SELECT.TMP SELECT.TLS 1>NUL 2>NUL'
     562          end
     563        end
    570564      end
    571565    end
    … …  
    585579
    586580'del SETENV.CMD 1>NUL 2>NUL'
    587 dummy = stream('SETENV.CMD','C','open')
    588 if dummy = 'READY:' then
     581rc = stream('SETENV.CMD','C','open')
     582if rc = 'READY:' then
    589583do
    590584  call lineout 'SETENV.CMD','@ECHO OFF'
    … …  
    615609 */
    616610
    617 
    618611rc = stream('SETENV.CMD','c','query exists')
    619612if rc \= '' then
    620613do
    621   dummy = value('COMSPEC',,'OS2ENVIRONMENT')
    622   if dummy = '' then dummy = value('OS2_SHELL',,'OS2ENVIRONMENT')
    623   if dummy = '' then dummy = 'CMD.EXE'
     614  shell = value('COMSPEC',,'OS2ENVIRONMENT')
     615  if shell = '' then shell = value('OS2_SHELL',,'OS2ENVIRONMENT')
     616  if shell = '' then shell = 'CMD.EXE'
    624617  title = "FM/2 Utilities command line"
    625618  classname = 'WPProgram'
    626619  location = '<FM3_Tools>'
    627   setup = 'EXENAME='dummy';PARAMETERS=/K 'rc';STARTUPDIR=C:\'
    628   call SysCreateObject classname,title,location,setup,u
     620  setup = 'EXENAME='shell';PARAMETERS=/K 'rc';STARTUPDIR=C:\'
     621  call SysCreateObject classname,title,location,setup,'u'
    629622end
    630623
    631624call SysMkDir curdir'\UTILS'
    632 dummy = directory(curdir'\UTILS')
    633 if dummy = curdir'\UTILS' then
     625if directory(curdir'\UTILS') \= curdir'\UTILS' then
     626  say "Couldn't switch to "curdir"\utils"
     627else
    634628do
    635629  'set PATH=%PATH%;'curdir'\utils'
    636630  'move ..\example.cmd 1>NUL 2>NUL'
    637631  'del FM2.CMD 1>NUL 2>NUL'
    638   dummy = stream('FM2.CMD','C','open')
    639   if dummy = 'READY:' then
     632  rc = stream('FM2.CMD','C','open')
     633  if rc = 'READY:' then
    640634  do
    641635    say 'Creating an FM2.CMD file.'
    … …  
    769763    call stream 'FM2.CMD','C','close'
    770764    'del AV2.CMD 1>NUL 2>NUL'
    771     dummy = stream('AV2.CMD','C','open')
    772     if dummy = 'READY:' then
     765    rc = stream('AV2.CMD','C','open')
     766    if rc = 'READY:' then
    773767    do
    774768      say 'Creating an AV2.CMD file.'
    … …  
    785779    else say "Couldn't create AV2.CMD file."
    786780    'del VDIR.CMD 1>NUL 2>NUL'
    787     dummy = stream('VDIR.CMD','C','open')
    788     if dummy = 'READY:' then
     781    rc = stream('VDIR.CMD','C','open')
     782    if rc = 'READY:' then
    789783    do
    790784      say 'Creating a VDIR.CMD file.'
    … …  
    816810    else say "Couldn't create VDIR.CMD file."
    817811    'del VTREE.CMD 1>NUL 2>NUL'
    818     dummy = stream('VTREE.CMD','C','open')
    819     if dummy = 'READY:' then
     812    rc = stream('VTREE.CMD','C','open')
     813    if rc = 'READY:' then
    820814    do
    821815      say 'Creating a VTREE.CMD file.'
    … …  
    831825    else say "Couldn't create VTREE.CMD file."
    832826    'del VCOLLECT.CMD 1>NUL 2>NUL'
    833     dummy = stream('VCOLLECT.CMD','C','open')
    834     if dummy = 'READY:' then
     827    rc = stream('VCOLLECT.CMD','C','open')
     828    if rc = 'READY:' then
    835829    do
    836830      say 'Creating a VCOLLECT.CMD file.'
    … …  
    910904    else say "Couldn't create VCOLLECT.CMD file."
    911905    'del INI.CMD 1>NUL 2>NUL'
    912     dummy = stream('INI.CMD','C','open')
    913     if dummy = 'READY:' then
     906    rc = stream('INI.CMD','C','open')
     907    if rc = 'READY:' then
    914908    do
    915909      say 'Creating an INI.CMD file.'
    … …  
    927921    else say "Couldn't create INI.CMD file."
    928922    'del EAS.CMD 1>NUL 2>NUL'
    929     dummy = stream('EAS.CMD','C','open')
    930     if dummy = 'READY:' then
     923    rc = stream('EAS.CMD','C','open')
     924    if rc = 'READY:' then
    931925    do
    932926      say 'Creating an EAS.CMD file.'
    … …  
    10071001    else say "Couldn't create EAS.CMD file."
    10081002    'del DIRSIZE.CMD 1>NUL 2>NUL'
    1009     dummy = stream('DIRSIZE.CMD','C','open')
    1010     if dummy = 'READY:' then
     1003    rc = stream('DIRSIZE.CMD','C','open')
     1004    if rc = 'READY:' then
    10111005    do
    10121006      say 'Creating a DIRSIZE.CMD file.'
    … …  
    10381032    else say "Couldn't create DIRSIZE.CMD file."
    10391033    'del UNDEL.CMD 1>NUL 2>NUL'
    1040     dummy = stream('UNDEL.CMD','C','open')
    1041     if dummy = 'READY:' then
     1034    rc = stream('UNDEL.CMD','C','open')
     1035    if rc = 'READY:' then
    10421036    do
    10431037      say 'Creating an UNDEL.CMD file.'
    … …  
    10531047    else say "Couldn't create UNDEL.CMD file."
    10541048    'del KILLPROC.CMD 1>NUL 2>NUL'
    1055     dummy = stream('KILLPROC.CMD','C','open')
    1056     if dummy = 'READY:' then
     1049    rc = stream('KILLPROC.CMD','C','open')
     1050    if rc = 'READY:' then
    10571051    do
    10581052      say 'Creating a KILLPROC.CMD file.'
    … …  
    10681062    else say "Couldn't create KILLPROC.CMD file."
    10691063    'del VIEWINFS.CMD 1>NUL 2>NUL'
    1070     dummy = stream('VIEWINFS.CMD','C','open')
    1071     if dummy = 'READY:' then
     1064    rc = stream('VIEWINFS.CMD','C','open')
     1065    if rc = 'READY:' then
    10721066    do
    10731067      say 'Creating a VIEWINFS.CMD file.'
    … …  
    10831077    else say "Couldn't create VIEWINFS.CMD file."
    10841078    'del VIEWHELP.CMD 1>NUL 2>NUL'
    1085     dummy = stream('VIEWHELP.CMD','C','open')
    1086     if dummy = 'READY:' then
     1079    rc = stream('VIEWHELP.CMD','C','open')
     1080    if rc = 'READY:' then
    10871081    do
    10881082      say 'Creating a VIEWHELP.CMD file.'
    … …  
    10981092    else say "Couldn't create VIEWHELP.CMD file."
    10991093    'del GLOBAL.CMD 1>NUL 2>NUL'
    1100     dummy = stream('GLOBAL.CMD','C','open')
    1101     if dummy = 'READY:' then
     1094    rc = stream('GLOBAL.CMD','C','open')
     1095    if rc = 'READY:' then
    11021096    do
    11031097      say 'Creating a GLOBAL.CMD file.'
    … …  
    11801174  end
    11811175  else say "Couldn't create FM2.CMD file.  Panic."
    1182   dummy = directory(curdir)
    1183 end
    1184 else say "Couldn't switch to "curdir"\utils"
     1176  call directory curdir
     1177end
    11851178
    11861179/* type the install.dat file to show any critical info/notices */
    … …  
    11911184  'type install.dat'
    11921185  'DEL INSTALL.DAT 1>NUL 2>NUL'
    1193   if unattended = 'UNATTENDED' then
     1186  if attended then
    11941187  do
    11951188    call charout ,'  Press [Enter] to continue...'
    1196     dummy = ''
    1197     do until dummy = '0d'x
    1198       dummy = SysGetKey('NOECHO')
     1189    ans = ''
     1190    do until ans = '0d'x
     1191      ans = SysGetKey('NOECHO')
    11991192    end
    12001193    call charout ,'0d1b'x'[K'
Note: See TracChangeset for help on using the changeset viewer.