Changeset 1017

Timestamp:

Apr 28, 2017, 1:52:24 PM (8 years ago)

Author:

Alex Taylor

Message:

Update logic for locating Samba Client Tools binaries to support ArcaOS (and be slightly smarter in some other cases).

File:

• trunk/guitools/shared/cltinit.vrs (modified) (8 diffs)

trunk/guitools/shared/cltinit.vrs

@@ -2 +2 @@
 
 /*:VRX */
-_CltInit: 
+_CltInit:
     IF options.!debug == 1 THEN say time()' _CltInit() started'
     IF options.!debug == 1 THEN say '  Checking Samba Client setup...'
 
-    /* debuglevel when executing Samba binaries */ 
+    /* debuglevel when executing Samba binaries */
     debuglevel = ' --debuglevel=0'
 
@@ -23 +23 @@
         ok = value("UNIXROOT",UnixRoot,'OS2ENVIRONMENT')
     end
-    
+
     IF options.!debug == 1 THEN say '  UnixRoot       = "'UnixRoot'"'
 
@@ -43 +43 @@
     samba.!smbclientexe = ""
     if samba.!smbclientexe = "" then do /* wellknown locations */
-        WellKnown = sysBootdrive()"\ecs\system\samba;"sysBootdrive()"\samba"
+        Osdir = value("OSDIR",,'OS2ENVIRONMENT')
+        if Osdir <> '' THEN
+            WellKnown = Osdir"\apps\smbclnt;"Osdir"\system\samba;"sysBootdrive()"\samba"
+        else
+            WellKnown = sysBootdrive()"\ecs\system\samba;"sysBootdrive()"\samba"
         Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
         if Programs <> "" then WellKnown = Wellknown';'Programs'\samba'
@@ -184 +188 @@
 
     IF options.!debug == 1 then do
-        if ErrorState then say "  One or more  basic Samba Client setup errors detected!" 
+        if ErrorState then say "  One or more  basic Samba Client setup errors detected!"
                       else say "  No basic Samba Client setup errors detected!"
     end
@@ -201 +205 @@
 
 /*:VRX */
-_ErrorBinaryNotFound: 
+_ErrorBinaryNotFound:
     /* Set error status variable and show a short message - incomplete! */
     msg = arg(1)
@@ -210 +214 @@
 
 /*:VRX */
-_ErrorDataFileNotFound: 
+_ErrorDataFileNotFound:
     /* Set error status variable and show a short message - incomplete! */
     msg = arg(1)
@@ -229 +233 @@
     end
     drop old_path
-    
+
     /* Add binary and tools path to the BEGINLIBPATH variable */
     old_beginlibpath = SysQueryExtLibPath("B")
@@ -242 +246 @@
     /* Set LIBPATHSTRICT (this is an option - disabled by default) */
     /* ok = value('LIBPATHSTRICT','T', 'OS2ENVIRONMENT') */
-    
+
     IF options.!debug == 1 THEN say time()' _SambaExtendSearchPath() done'
 return