Changeset 818

Timestamp:

Nov 18, 2010, 1:48:22 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: UpdateQtSysConf.cmd: Added ability to delete keys (specify no '=value' part for a key to delete it).

File:

• packaging/UpdateQtSysConf.cmd (modified) (5 diffs)

packaging/UpdateQtSysConf.cmd

@@ -22 +22 @@
     i = qt_conf.0 + 1
     qt_conf.i = linein(qt_conf)
+    qt_conf.i.!d = 0
     qt_conf.0 = i
 end
@@ -31 +32 @@
 do while(rest \== '')
     parse var rest v','rest
-    parse var v v'='val
-    v = strip(v)
-    val = strip(val)
-    val = Replace(val, '\(', '(')
-    val = Replace(val, '\)', ')')
-    val = translate(val, '/', '\')
-    if (v \== '') then do
+    if (pos('=', v) = 0) then do
+        /* delete */
         if (symbol('aVars.v') == 'VAR') then do
-            /* already exists, take new value */
-            aVars.v = val
+            /* already exists, mark as deleted */
+            aVars.v.!d = 1
             iterate
         end
         w = aVars.0 + 1
         aVars.w = v
-        aVars.v = val
+        aVars.v = ''
+        aVars.v.!d = 1
         aVars.0 = w
+    end
+    else do
+        /* add/replace value */
+        parse var v v'='val
+        v = strip(v)
+        val = strip(val)
+        val = Replace(val, '\(', '(')
+        val = Replace(val, '\)', ')')
+        val = translate(val, '/', '\')
+        if (v \== '') then do
+            if (symbol('aVars.v') == 'VAR') then do
+                /* already exists, take new value */
+                aVars.v = val
+                aVars.v.!d = 0
+                iterate
+            end
+            w = aVars.0 + 1
+            aVars.w = v
+            aVars.v = val
+            aVars.v.!d = 0
+            aVars.0 = w
+        end
     end
 end
@@ -59 +78 @@
 end
 
-/* replace existing values */
+/* replace/delete existing values */
 do i = p + 1 to qt_conf.0
     parse var qt_conf.i v'='val
@@ -69 +88 @@
     if (v \== '') then do
         if (symbol('aVars.v') == 'VAR') then do
-            qt_conf.i = v '= "'aVars.v'"'
+            if (aVars.v.!d) then do
+                qt_conf.i.!d = 1
+            end
+            else do
+                qt_conf.i = v '= "'aVars.v'"'
+            end
             drop aVars.v /* mark as processed */
         end
@@ -78 +102 @@
 call SysFileDelete qt_conf
 do i = 1 to qt_conf.0
+    if (qt_conf.i.!d) then
+        iterate /* skip deleted */
     call lineout qt_conf, qt_conf.i
     if (i == p) then do