Changeset 54 for trunk/gui/printer/cupswiz/cupswiz.VRX

Timestamp:

Dec 16, 2016, 2:54:23 PM (9 years ago)

Author:

Alex Taylor

Message:

More minor modifications for compatibility with RPM-installed CUPS.

File:

• trunk/gui/printer/cupswiz/cupswiz.VRX (modified) (4 diffs)

trunk/gui/printer/cupswiz/cupswiz.VRX

@@ -383 +383 @@
     ARG create_os2
 
+    cups_etc = globals.!cupsdir'\etc'
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = globals.!cupsdrv'\etc'
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = VALUE('ETC',,'OS2ENVIRONMENT')
+    IF \VRIsDir( cups_etc'\cups\ppd') THEN
+        cups_etc = '\etc'
+
     /* Create the CUPS printer */
     IF globals.!remotecups == '' THEN DO
@@ -417 +425 @@
                 cups_ppd = globals.!prt_ppd
                 IF cups_ppd == '' THEN
-                    cups_ppd = STREAM( globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
+                    cups_ppd = STREAM( cups_etc'\cups\ppd\'globals.!prt_name'.ppd', 'C', 'QUERY EXISTS')
                 IF cups_ppd == '' THEN DO
-                    CALL LINEOUT globals.!log1, 'CUPS PPD for this printer ('globals.!cupsdir'\etc\cups\ppd\'globals.!prt_name'.ppd) does not exist.'
+                    CALL LINEOUT globals.!log1, 'CUPS PPD for this printer ('cups_etc'\cups\ppd\'globals.!prt_name'.ppd) does not exist.'
                     CALL LINEOUT globals.!log1, 'Cannot import PPD.  Prompting user for preferred printer model.'
                     CALL PromptForPMName
@@ -1287 +1295 @@
      */
     PARSE VALUE VRGetIni('eCups', 'CUPS', 'USER') WITH cupsdrv '00'x
+    IF cupsdrv == '' THEN DO
+        cupsd_exe = SysSearchPath('PATH', 'cupsd.exe')
+        IF cupsd_exe <> '' THEN 
+            cupsdrv = FILESPEC('DRIVE', cupsd_exe )
+    END
     IF cupsdrv == '' THEN
         cupsdrv = VRParseFilePath( me, 'D') || ':'
     ELSE
         cupsdrv = STRIP( cupsdrv, 'T', '\')
-    globals.!cupsdir = cupsdrv'\cups'
+
+    IF VRIsDir( cupsdrv'\cups') THEN
+        globals.!cupsdir = cupsdrv'\cups'
+    ELSE
+        globals.!cupsdir = cupsdrv'\usr'
+    globals.!cupsroot = cupsdrv
 
     /* Get system paths.
@@ -1928 +1946 @@
     CALL NLSSetText 'SW_ABOUT',  'Caption', 10                                          /* 10: Product Information */
     CALL NLSSetText 'DT_ABOUT1', 'Caption', 11                                          /* 11: eCups Printer Install Utility */
-    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.1'                                   /* 12: Version %1 */
+    CALL NLSSetText 'DT_ABOUT2', 'Caption', 12, '1.11'                                  /* 12: Version %1 */
     CALL NLSSetText 'DT_ABOUT3', 'Caption', 13, '2010-2016'                             /* 13: (C) %1 Alex Taylor */
     CALL NLSSetText 'PB_ABOUT',  'Caption', 2                                           /* 10: Product Information */