Changeset 9025 for trunk/tools

Timestamp:

Aug 18, 2002, 3:48:54 PM (23 years ago)

Author:

bird

Message:

Added '~'.

File:

• trunk/tools/bin/buildenv.cmd (modified) (8 diffs)

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.14 2002-08-18 13:29:20 bird Exp $
+/* $Id: buildenv.cmd,v 1.15 2002-08-18 13:48:54 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -13 +13 @@
  *       those the original value, for example of no_NO, is not restored.
  *     - Same goes for some other stuff, we have no stack of previous values.
+ *             
+ * Copyright (c) 1999-2002 knut st. osmundsen (bird@anduin.net)
+ *
+ * GPL v2
+ *
  */
     
@@ -22 +27 @@
      * Version
      */
-    sVersion = '1.0.1 [2002-08-18]';
+    sVersion = '1.0.2 [2002-08-18]';
     
     /*
@@ -51 +56 @@
         say ''
         say 'Actions:'
-        say '   +   Install tools in environment. Default action.'
-        say '   -   Remove tools from environment.'
+        say '   +   Install tool in environment. Default action.'
+        say '   ~   Install tool in environment if it''s configured.'
+        say '   -   Remove tool from environment.'
         say '   *   Configure tool if needed.'
         say '   !   Forced tool configuretion.'
@@ -155 +161 @@
          */
         ch = substr(sEnv.i, length(sEnv.i), 1);
-        if (ch = '-' | ch = '+' | ch = '*' | ch = '!' | ch = '?' | ch = '@') then
+        if (ch = '-' | ch = '+' | ch = '*' | ch = '!' | ch = '?' | ch = '@' | ch = '~') then
             sEnv.i = substr(sEnv.i, 1, length(sEnv.i) - 1);
+        else
+            ch = '+';
         fRM = (ch = '-');
         fCfg = (ch = '*');
@@ -162 +170 @@
         fVerify = (ch = '@')
         fQuery = (ch = '?')
+        fOptional = (ch = '~')
 
         /*
@@ -271 +280 @@
                         else if (fQuery) then
                         do
-                            /*rc = CfgVerify(j, 1, 1);*/
                             rc = 0;
                             if (\CfgIsConfigured(j)) then
@@ -277 +285 @@
                         end
                         else
-                            rc = CfgInstallUninstall(j, fRM);
+                        do
+                            if (\fOptional) then
+                                rc = CfgInstallUninstall(j, fRM);
+                            else if (CfgIsConfigured(j)) then
+                                rc = CfgInstallUninstall(j, fRM);
+                        end
                         leave;
                     end