Changeset 1644 for spec/trunk/SPECS/os2-rpm

Timestamp:

May 28, 2019, 2:29:12 PM (6 years ago)

Author:

herwigb

Message:

spec: os2-rpm: Release version 1-7.

Location:

spec/trunk/SPECS/os2-rpm

Files:

• warpin-conflicts.cmd (modified) (8 diffs)
• wpi4rpm.cmd (modified) (5 diffs)

spec/trunk/SPECS/os2-rpm/warpin-conflicts.cmd

@@ -12 +12 @@
  *
  * Author: Dmitriy Kuminov
+ * Version: 1.4 - 2019-05-27 (Silvan Scherrer)
+ *   - Check for dummy WarpIN entries from wpi4rpm
  * Version: 1.3 - 2018-02-19 (Herwig Bauernfeind)
  *   - Shorten and apply common style to error messages to make the readable
@@ -48 +50 @@
 parse arg G.Args
 
+G.WarpInDir = strip(SysIni('USER', 'WarpIN', 'Path'), 'T', '0'x)
+rc = SysFileTree(G.WarpInDir'\DATBAS_?.INI', 'G.inis', 'FO')
+if (rc \== 0) then do
+     G.inis = 0
+end
+
 return Main()
 
@@ -67 +75 @@
         if (ver \== '') then do
             say ver
+            rpmdummy = GetRpmVersion(G.Args, ver)
+            if (rpmdummy == 'Y') then exit 0
             exit 1
         end
@@ -91 +101 @@
     if (ver == '') then exit 0
 
+    rpmdummy = GetRpmVersion(packages.i, ver)
+    if (rpmdummy == 'Y') then exit 0
+
     say 'ERROR: warpin-conflicts: Please, uninstall WarpIN 'packages.i' (Version 'ver')'
     exit 1
@@ -101 +114 @@
  * @return          Package version or ''.
  */
-GetPkgVersion: procedure
+GetPkgVersion: procedure expose(Globals)
     parse arg aPkgId
     parse var aPkgId v1'\'a1'\'p1
     if (v1 == '' | a1 == '' | p1 == '') then return ''
     ver = ''
-    WarpInDir = strip(SysIni('USER', 'WarpIN', 'Path'), 'T', '0'x)
-    if (WarpInDir \== '') then do
+    if (G.WarpInDir \== '') then do
         /* first, check if we have WIC that supports -p (1.0.16+) */
         wic_ver = ''
-        wic_exe = stream(WarpInDir'\WIC.EXE', 'C', 'QUERY EXISTS')
+        wic_exe = stream(G.WarpInDir'\WIC.EXE', 'C', 'QUERY EXISTS')
         if (wic_exe \== '') then do
             temp_dir = value('TMP',, 'OS2ENVIRONMENT')
             if (temp_dir = '') then temp_dir = value('TEMP',, 'OS2ENVIRONMENT')
             temp_file = SysTempFileName(temp_dir'\wic?????.tmp')
-            call SysSetExtLibPath WarpInDir';%BEGINLIBPATH%', 'B'
+            call SysSetExtLibPath G.WarpInDir';%BEGINLIBPATH%', 'B'
             address 'cmd' wic_exe '-h 2>nul 1>'temp_file
             if (rc == 0) then do
@@ -144 +156 @@
         end
         /* sad, but we failed with WIC and have to use the old unsatable method... */
-        rc = SysFileTree(WarpInDir'\DATBAS_?.INI', 'inis', 'FO')
-        if (rc == 0) then do
-            do i = 1 to inis.0
-                rc = SysIni(inis.i, 'ALL:', 'apps')
+        if (G.inis \== 0) then do
+            do i = 1 to G.inis.0
+                rc = SysIni(G.inis.i, 'ALL:', 'apps')
                 if (rc == '') then do
                     do j = 1 to apps.0
@@ -160 +171 @@
                 end
                 else do
-                    say 'ERROR: warpin-conflicts: Failed to access the WarpIn database file 'inis.i
+                    say 'ERROR: warpin-conflicts: Failed to access the WarpIn database file 'G.inis.i
                     exit 5
                 end
@@ -167 +178 @@
     end
     return ''
+
+GetRpmVersion: procedure expose(Globals)
+    parse arg aPkgId, aPkgVer
+
+    app = strip(translate(aPkgId, '', '"')) || '\' || translate(aPkgVer, '\', '.')
+    files = ''
+    if (G.WarpInDir \== '') then do
+        if (G.inis \== 0) then do
+            do i = 1 to G.inis.0
+                files = SysIni(G.inis.i, app, 'Files')
+                if (files \== '') then leave
+            end
+        end
+    end
+    if (files == 'rpmdummy') then do
+       return 'Y'
+    end
+    else do
+       return 'N'
+    end

spec/trunk/SPECS/os2-rpm/wpi4rpm.cmd

@@ -1 +1 @@
 /* WPI4RPM */
 
-ScriptVer = '0.9.9.1'
+ScriptVer = '1.0.0.0'
 
 /*  Synopsis:
@@ -51 +51 @@
 Mode = translate(mode)
 
-if Mode = "ADD" | Mode = "DEL" then do
+if Mode = "ADD" | Mode = "DEL" | Mode = "CHK" then do
     if verbose then say 'INFO:  wpi4rpm: Mode = "'Mode'"'
+    if words(arguments) = 2 then arguments = arguments' 99.99.99-99'
     cversion  = word(arguments,words(arguments))
     pRApp     = substr(arguments,length(mode)+2,length(arguments)-(length(mode)+1)-(length(cversion)+1))
@@ -67 +68 @@
     
     if pos('/',pRApp) = 0 then do
-        RApp = pRApp
+        RApp = strip(pRApp)
         RVendor   = "wpi4rpm" /* We do not add the true vendor on purpose */
         RPackage  = "wpi4rpm" /* We do not add the true packages on purpose */
@@ -83 +84 @@
 end
 else do
-    say 'WPI4RPM Version 'ScriptVer' (c) 2017-2018 Herwig Bauernfeind for bww bitwise works GmbH.'
+    say 'WPI4RPM Version 'ScriptVer' (c) 2017-2019 Herwig Bauernfeind for bww bitwise works GmbH.'
     say 
-    say '  Adds or removes dummy WPI packages to WarpIN database.'
+    say '  Adds dummy, removes or checks for WPI packages in WarpIN database.'
     say 
     say '  wpi4rpm ADD "Vendor/App/Package" x.x.x-x'
     say '  wpi4rpm DEL "Vendor/App/Package" x.x.x-x'
+    say '  wpi4rpm CHK "Vendor/App/Package" [x.x.x-x]'
     say '  wpi4rpm HELP | /? | /H | /HELP | -H | --HELP'
     say 
@@ -170 +172 @@
         end
     end
+    when mode = "CHK" then do
+        if verbose then say 'INFO:  wpi4rpm: "'Datbas'" will be used.'
+        AppFound = 0
+        do I = 1 to WarpINApps.0
+            parse var WarpINApps.I WVendor '\' WApp '\' WPackage '\' WMV '\' WLV '\' WBL '\' WRV
+            if pos(WApp'\', AppString) > 0 then do
+                if RMV'\'RLV'\'RBL'\'RRV = '99\99\99\99' then Appfound = 1
+                else if pos(WMV'\'WLV'\'WBL'\'WRV, AppString) > 0 then Appfound = 1
+                if verbose then say 'INFO:  wpi4rpm: "'WarpINApps.I'" found.'
+            end
+            if Appfound = 1 then leave
+                end
+                exit AppFound
+    end
     otherwise do
         say "ERROR: wpi4rpm: Unknown command invoked. Run wpi4rpm help to learn about usage."