Changeset 704 for branches/scripts/smb_init

Timestamp:

Jul 9, 2012, 11:22:56 AM (13 years ago)

Author:

Herwig Bauernfeind

Message:

smb.cmd 3.1.6: Fix: Also look into smb.cmd's directory for smbd.exe

File:

• branches/scripts/smb_init/smb.cmd (modified) (3 diffs)

branches/scripts/smb_init/smb.cmd

@@ -1 @@
-/* Samba Server for eCS (OS/2) init script Version 3.1.4
-   Copyright (C) netlabs.org 2007-2009
+/* Samba Server for eCS (OS/2) init script Version 3.1.6
+   Copyright (C) netlabs.org 2007-2012
 
    This program is free software; you can redistribute it and/or modify
@@ -176 +176 @@
     /* smbd.exe */
     samba.!smbd = ""
+    if samba.!smbd = "" then do /* in smb.cmd's directory? */
+        ok = SysFileTree(samba.!tools'\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
     if samba.!smbd = "" then do /* in current directory? */
         ok = SysFileTree('.\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in RPM/YUM/FHS tree */
+        ok = SysFileTree(UnixRoot'\usr\bin\smbd.exe', exist.,'FO')
         if exist.0 = 1 then samba.!smbd = exist.1
     end
@@ -420 +428 @@
         /* Do not add path or .exe to smbd here!!! */
         'detach smbd'
-        ok = SysSleep(0.1)
+        do while \_SambaRunning()
+            ok = SysSleep(0.1)
+        end
     end
     if running.!nmbd = 0 & (svc = "NMBD" | svc = "") then do