Changeset 56 for trunk/gui/printer/manager/PRINTOOL.VRX

Timestamp:

Feb 14, 2017, 6:55:44 AM (9 years ago)

Author:

Alex Taylor

Message:

Updated PrintMan to deal with RPM-installed CUPS. WPI packaging modifications. Set svn:ignore props on various directories.

Location:

trunk/gui/printer/manager

Files:

• . (modified) (1 prop)
• PRINTOOL.VRX (modified) (3 diffs)

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -236 +236 @@
     PARSE ARG _host, _dest
 
+    IF globals.!programs.!lpadmin == '' THEN DO
+        CALL LINEOUT globals.!log1, 'lpadmin is not available, cannot delete CUPS queue.'
+        RETURN 0
+    END
+
     IF TRANSLATE( _host ) <> 'LOCALHOST' THEN
         del_cmd = globals.!programs.!lpadmin '-h' _host '-x' _dest
@@ -895 +900 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.51'
-    globals.!copyright = '2013-2015'
+    globals.!version = '0.6'
+    globals.!copyright = '2013-2017'
 
     me = VRGet('Application', 'Program')
@@ -910 +915 @@
         cupsdrv = STRIP( cupsdrv, 'T', '\')
     globals.!cupsdir = cupsdrv'\cups'
+    IF \VRIsDir( globals.!cupsdir ) THEN DO
+        unixroot = VALUE('UNIXROOT',,'OS2ENVIRONMENT')
+        IF unixroot <> '' THEN
+            globals.!cupsdir = unixroot'\usr'
+        ELSE
+            globals.!cupsdir = cupsdrv'\usr'
+    END
 
     /* Get system paths.