Changeset 1060

Timestamp:

Oct 5, 2019, 8:22:33 PM (6 years ago)

Author:

Alex Taylor

Message:

Look for net.exe in /@unixroot/libexec/samba if not found in normal location

Location:

branches/guitools-arcamap-2.5/shared

Files:

• cltinit.vrs (modified) (2 diffs)
• nlv.vrs (modified) (9 diffs)

branches/guitools-arcamap-2.5/shared/cltinit.vrs

@@ -1 +1 @@
 /* Perform basic Samba Client init stuff */
 
-/* Samba Client Initialization 
+/* Samba Client Initialization
 Copyright (C) 2007-2017 Herwig Bauernfeind for bww bitwise works GmbH.
 
@@ -118 +118 @@
     /* net.exe */
     samba.!netexe = samba.!bin'\net.exe'
+    if \VRFileExists(samba.!netexe) then
+        samba.!netexe = UnixRoot'\usr\libexec\samba\net.exe'
     if \VRFileExists(samba.!netexe) then call _ErrorBinaryNotFound " could not find net.exe!"
     IF options.!debug == 1 THEN say '  net.exe        = "'samba.!netexe'"'

branches/guitools-arcamap-2.5/shared/nlv.vrs

@@ -24 +24 @@
     parse var execDir srchroot '\BIN'
 
-    say '  NLV execDir    = "'execDir'"'
-    say '  NLV srchroot   = "'srchRoot'"'
+    if options.!debug = 1 then say '  NLV execDir    = "'execDir'"'
+    if options.!debug = 1 then say '  NLV srchroot   = "'srchRoot'"'
 
     filestem = VRParseFileName( execPath, "N")
@@ -33 +33 @@
         otherwise filestem = strip(SUBSTR( filestem, 1, 5 ))||'_' 
     end
-    say '  NLV filestem   = "'filestem'"'
+    if options.!debug = 1 then say '  NLV filestem   = "'filestem'"'
 
     /* First, figure out what language/message file to use */
@@ -55 +55 @@
 /*:VRX         NLVSearch
 */
-NLVSearch: procedure expose filestem execdir srchroot
+NLVSearch: procedure expose filestem execdir srchroot options.
     nlv     = arg(1)
     SubDir  = arg(2)
@@ -64 +64 @@
     UnixRoot = value("UNIXROOT",,"OS2ENVIRONMENT")
     do until NLVSrchDone = 1
-        say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
+        IF options.!debug == 1 then say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
         select
             when VRFileExists(execdir'\'filestem||nlv'.'Suffix) then do
-                say "  Attempt1: NLV "Suffix" file found directly!"
+                IF options.!debug == 1 then say "  Attempt1: NLV "Suffix" file found directly!"
                 NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
             end
             when VRFileExists(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix) then do
-                say "  Attempt2: NLV "Suffix" file found directly!"
+                IF options.!debug == 1 then say "  Attempt2: NLV "Suffix" file found directly!"
                 NLVFile = strip(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
@@ -78 +78 @@
             when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
                 execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
-                say "  Attempt3: NLV "Suffix" file found via "PathVar
+                IF options.!debug == 1 then say "  Attempt3: NLV "Suffix" file found via "PathVar
                 NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
@@ -85 +85 @@
                 ok = SysFileTree(UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
                 if nlvmsg.0 = 1 then do
-                    say "  Attempt4: Found  NLV "Suffix" file in rpm/yum subdirectory"
+                    IF options.!debug == 1 then say "  Attempt4: Found  NLV "Suffix" file in rpm/yum subdirectory"
+                    NLVFile = VRParseFilename(nlvmsg.1,"DPN")'.'Suffix
+                    IF options.!debug == 1 then say "  Adding NLV "Suffix" path to "PathVar
+                    OldPathVar = value(PathVar,,"OS2ENVIRONMENT")
+                    ok = value(PathVar,VRParseFilename(nlvmsg.1,"DP")';'OldPathVar,"OS2ENVIRONMENT")
+                    NLVSrchDone = 1
+                end
+                else IF options.!debug == 1 then say "  NLV "Suffix" file NOT in rpm/yum "UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix"subdirectory."
+            end
+           
+            otherwise do
+                IF options.!debug == 1 then say "  Searching subdirectories"
+                ok = SysFileTree(srchRoot'\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
+                if nlvmsg.0 = 1 then do
+                    IF options.!debug == 1 then say "  Found  NLV "Suffix" file in subdirectory"
                     NLVFile = VRParseFilename(nlvmsg.1,"DPN")'.'Suffix
                     say "  Adding NLV "Suffix" path to "PathVar
@@ -92 +106 @@
                     NLVSrchDone = 1
                 end
-                else say "  NLV "Suffix" file NOT in rpm/yum "UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix"subdirectory."
-            end
-           
-            otherwise do
-                say "  Searching subdirectories"
-                ok = SysFileTree(srchRoot'\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
-                if nlvmsg.0 = 1 then do
-                    say "  Found  NLV "Suffix" file in 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 found in subdirectories!"
+                else IF options.!debug == 1 then say "  NLV "Suffix" file not found in subdirectories!"
             end
         end
@@ -116 +116 @@
             end
             else do
-                say "  NLV "Suffix" File not found, falling back to EN."
+                IF options.!debug == 1 then say "  NLV "Suffix" File not found, falling back to EN."
                 nlv = "EN"
                 /* Now we repeat the whole procedure to find the EN file */
@@ -122 +122 @@
         end
     end
-    say time()' NLVSearch() done, returning "'NLVFile'"'
+    IF options.!debug == 1 then say time()' NLVSearch() done, returning "'NLVFile'"'
 return NLVFile