Changeset 924 for trunk/guitools/shared/nlv.vrs

Timestamp:

Jun 14, 2016, 4:14:19 PM (5 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI: Start implementinig client side Samba configuration settings

File:

• trunk/guitools/shared/nlv.vrs (modified) (5 diffs)

trunk/guitools/shared/nlv.vrs

@@ -7 +7 @@
      */
 
+    /* settings.! variables used in NLV.VRS
+       settings.!messages: 0 = there are no message files, do not search them
+                           any other value = look for message files
+       settings.!helpfile: 0 = there are no helpfiles, do not search them
+                           any other value = look for message files
+       settings.!nlv8dot3: 0 = nlv files do not conform to 8.3 names
+                           any other value = nlv files are shortened to 8.3
+     */
+     
     IF options.!debug == 1 THEN SAY time()' NLVSetup() started'
     IF options.!debug == 1 THEN SAY '  NLVSetup() is (c) Alex Taylor, portions (c) Herwig Bauernfeind'
@@ -19 +28 @@
 
     filestem = VRParseFileName( execPath, "N")
-    if translate(filestem) = "EVFSGUI" then filestem = "evfsi_"
-    else filestem = SUBSTR( filestem, 1, 6, '_' )
+    select
+        when settings.!nlv8dot3 = 0 then filestem = filestem||'_'
+        when translate(filestem) = "EVFSGUI" then filestem = "evfsi_"
+        otherwise filestem = SUBSTR( filestem, 1, 5 )||'_' 
+    end
     say '  NLV filestem   = "'filestem'"'
 
@@ -32 +44 @@
 
     /* Find the messagefile and helpfile */
-    settings.!messages = NLVsearch(nlv,'LANG','MSG','DPATH')
-    settings.!helpfile = NLVsearch(nlv,'HELP','HLP','HELP')
+    if settings.!messages <> 0 then settings.!messages = NLVsearch(nlv,'LANG','MSG','DPATH')
+    if settings.!helpfile <> 0 then settings.!helpfile = NLVsearch(nlv,'HELP','HLP','HELP')
 
     IF options.!debug == 1 THEN SAY '  NLV MessageFile = "'settings.!messages'"'
@@ -51 +63 @@
     NLVSrchDone = 0
     NLVFile = ""
+    UnixRoot = value("UNIXROOT",,"OS2ENVIRONMENT")
     do until NLVSrchDone = 1
         say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
@@ -58 +71 @@
                 NLVFile = strip(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
+            end
+            when VRFileExists(UnixRoot||'\usr\share\os2') then do
+                ok = SysFileTree(UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
+                if nlvmsg.0 = 1 then do
+                    say "  Found  NLV "Suffix" file in rpm/yum subdirectory"
+                    NLVFile = VRParseFilename(nlvmsg.1,"DPN")'.'Suffix
+                    say "  Adding NLV "Suffix" path to "PathVar
+                    OldPathVar = value(PathVar,,"OS2ENVIRONMENT")
+                    ok = value(PathVar,VRParseFilename(nlvmsg.1,"DP")';'OldPathVar,"OS2ENVIRONMENT")
+                    NLVSrchDone = 1
+                end
+                else say "  NLV "Suffix" file NOT in rpm/yum subdirectory."
             end
             when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do