Changeset 1609 for trunk

Timestamp:

Aug 8, 2011, 1:56:39 AM (14 years ago)

Author:

John Small

Message:

Ticket 460: Fix bug in standalone installation of FM/2 Utilities

Location:

trunk/warpin

Files:

• fm2.wis.in (modified) (7 diffs)
• fm2Utils.wis (modified) (2 diffs)

trunk/warpin/fm2.wis.in

@@ -16 +16 @@
    28 Oct 08 JBS Ticket 294: Add support for new object icons.
    12 Apr 10 JBS Ticket 430: Add deletion of the now obsolete FM2RES.STR, if present
+   07 Aug 11 JBS Ticket 460: Fix bug in standalone installation of FM/2 Utilities (and
+                             correct a couple of object settings)
 
    NOTE: If a NON-EXTERNAL package (i.e. a package whose files
@@ -76 +78 @@
   CREATEOBJECT="WPFolder|File Manager/2|<WP_DESKTOP>|ICONFILE=$(1)\icons\fm2fldr.ICO;ICONNFILE=1,$(1)\icons\fm2fldr2.ICO;CCVIEW=NO;OBJECTID=<FM3_Folder>;"
   CREATEOBJECT="FAIL WPProgram|FM/2|<FM3_Folder>|EXENAME=$(1)\fm3.exe;PARAMETERS=%*;STARTUPDIR=$(1);CCVIEW=YES;OBJECTID=<FM/2>;"
-  CREATEOBJECT="WPProgram|FM/2|<FM3_Folder>|EXENAME=$(1)\fm3.exe;STARTUPDIR=$(1);CCVIEW=YES;OBJECTID=<FM/2>;"
+  CREATEOBJECT="WPProgram|FM/2|<FM3_Folder>|EXENAME=$(1)\fm3.exe;STARTUPDIR=$(1);OBJECTID=<FM/2>;"
   CREATEOBJECT="FAIL WPProgram|FM/2 Lite|<FM3_Folder>|EXENAME=$(1)\fm4.exe;PARAMETERS=%*;STARTUPDIR=$(1);CCVIEW=YES;TITLE=FM/2 LITE;OBJECTID=<FM/2 LITE>;"
-  CREATEOBJECT="WPProgram|FM/2 Lite|<FM3_Folder>|EXENAME=$(1)\fm4.exe;STARTUPDIR=$(1);CCVIEW=YES;TITLE=FM/2 LITE;OBJECTID=<FM/2 LITE>;"
+  CREATEOBJECT="WPProgram|FM/2 Lite|<FM3_Folder>|EXENAME=$(1)\fm4.exe;STARTUPDIR=$(1);TITLE=FM/2 LITE;OBJECTID=<FM/2 LITE>;"
   CREATEOBJECT="WPFolder|FM/2 Tools|<FM3_Folder>|ICONFILE=$(1)\icons\toolbox.ICO;ICONNFILE=1,$(1)\icons\toolbox2.ICO;OBJECTID=<FM3_Tools>;"
   CREATEOBJECT="WPFolder|FM/2 Docs|<FM3_Folder>|ICONFILE=$(1)\icons\docs.ICO;ICONNFILE=1,$(1)\icons\docs2.ICO;OBJECTID=<FM3_Docs>;"
@@ -107 +109 @@
   CLEARPROFILE="USER\FM/2"
 
-
 >This package contains the base File Manager/2 (FM/2) package.
 
@@ -130 +131 @@
   CREATEOBJECT="WPProgram|Delete Tree|<FM2_Utilities>|EXENAME=*;PROGTYPE=WINDOWABLEVIO;PARAMETERS=/c ($(7)\deltree.exe [Enter directory to delete:] || pause);OBJECTID=<FM2Deltree>;"
   CONFIGSYS="SET PATH=$(7); | ADDRIGHT"
-  EXECUTE="$(7)\shdwmgr FM2UTILS"
+  EXECUTE="$(1)\Utils\shdwmgr FM2UTILS"
 >This package contains the FM/2 Utilities, a
 collection of more than 60  utilities which may
@@ -166 +167 @@
 </PAGE>
 
-
 <!-- The TYPE=CONTAINER will list the packages which can be installed. -->
 <PAGE INDEX=3 TYPE=CONTAINER>
@@ -172 +172 @@
 <TEXT>Select your installation directory.</TEXT>
 </PAGE>
-
 
 <PAGE INDEX=4 TYPE=CONFIGURE>
@@ -204 +203 @@
 <TEXT>Please select/deselect the desired configuration option(s).
 
-The CONFIG.SYS modification is the addition of the FM/2 Utilities installation directory to end of the PATH (if it is not already on the PATH), simplifying access to the utiities from the command line.
-
-Uncheck "Modify CONFIG.SYS" if you do not want your PATH changed.</TEXT>
-</PAGE>
-
+If "FM/2 Utilities" have been selected, a "CONFIG.SYS modification" will appear below. This modification is the addition of the FM/2 Utilities installation directory to end of the PATH (if it is not already on the PATH), simplifying access to the utiities from the command line.
+
+Uncheck "Modify CONFIG.SYS" (if present) if you do not want your PATH changed.</TEXT>
+</PAGE>
 
 </BODY>

trunk/warpin/fm2Utils.wis

@@ -1 +1 @@
 <!--
  $Id$
+
+ Change log:
+   07 Aug 11 JBS Ticket 460: Fix bug in standalone installation of FM/2 Utilities
 
  WARPIN VERSION 0.9.20 is required for PACKAGEID's with revision levels.
@@ -13 +16 @@
    warpin_path = strip(SysIni(, 'WarpIN', 'Path'), 'T', '00'x)
    database_file = warpin_path || '\DATBAS_' || left(SysBootDrive(), 1) || '.INI'
-   call SysIni database_file, 'ALL:', 'apps.'
    fm2_app_prefix = 'Netlabs\FM2\Base\'
    fm2_app_prefix_len = length(fm2_app_prefix)
-   do a = 1 to apps.0
-      if left(apps.a, fm2_app_prefix_len) = fm2_app_prefix then
-         leave
-   end
-   if a > apps.0 then
-      target_path = WirexxGetEnv('WARPIN_DEFAULTTOOLSPATH')
-   else
-      target_path = strip(SysIni(database_file, apps.a, 'TargetPath'), 'T', '00'x) || '\Utils'
+   target_path = WirexxGetEnv('WARPIN_DEFAULTTOOLSPATH') || '\FM2Utils'
+   if SysIni( database_file, 'ALL:', 'apps.') \= 'ERROR:' then
+      do a = 1 to apps.0
+         if left(apps.a, fm2_app_prefix_len) = fm2_app_prefix then
+            do
+               target_path = strip(SysIni(database_file, apps.a, 'TargetPath'), 'T', '00'x) || '\Utils'
+               leave
+            end
+      end
    return target_path
 </REXX>
 
 <PCK INDEX=7
-  PACKAGEID="Netlabs\FM2 Utilities\FM2Utils\1\0\0"
+  PACKAGEID="Netlabs\FM2 Utilities\FM2Utils\1\1\1"
   TITLE="FM/2 Utilities"
   TARGET="=("FindFM2")"