Changeset 451 for branches/guitools-1.0/shared

Timestamp:

May 25, 2010, 6:17:14 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SSCC 1.0.0, SMBUsers 0.9.8 several fixes, rest

Location:

branches/guitools-1.0/shared

Files:

• sambainit.vrs (modified) (5 diffs)
• swat.vrs (modified) (5 diffs)

branches/guitools-1.0/shared/sambainit.vrs

@@ -42 +42 @@
     /* smbd.exe */
     samba.!smbd = ""
+    if samba.!smbd = "" then do /* USER\Samba\ServerPath */
+        call charout , "  Is Samba ServerPath stored in OS2.INI? "
+        samba.!bin = strip(VRGetIni( "Samba", "ServerPath2", "USER" ),'T','00'x)
+        if samba.!bin <> "" then do
+            say 'Yes, found "'samba.!bin'"'
+            if VRFileExists(samba.!bin"\smbd.exe") then do
+                samba.!smbd = samba.!bin"\smbd.exe"
+                say '  Found "'samba.!smbd'".'
+            end
+        end
+        else say 'No, possibly manual installation.'
+    end
+    if samba.!smbd = "" then do /* wellknown locations */
+        WellKnown = SysBootdrive()"\ecs\system\samba;"SysBootdrive()"\samba"
+        Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
+        if Programs <> "" then WellKnown = Wellknown';'Programs'\samba'
+        Tools = value("TOOLS",,'OS2ENVIRONMENT')
+        if Tools <> "" then WellKnown = Wellknown';'Tools'\samba'
+        call charout , "  Are binaries in wellknown locations? "
+        ok = VRFindFile("smbd.exe",WellKnown)
+        if ok <> "" then say "Yes."; else say "No."
+        if ok <> "" then samba.!smbd = ok
+        drop Wellknown Tools Programs
+    end
     if samba.!smbd = "" then do /* in current directory? */
         call charout , "  Are binaries in current directory? "
         ok = SysFileTree('.\smbd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbd = exist.1
     end
@@ -51 +75 @@
         call charout , "  Are binaries in parent directory? "
         ok = SysFileTree('..\smbd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbd = exist.1
     end
@@ -57 +81 @@
         call charout , "  Are binaries in ..\BIN directory? "
         ok = SysFileTree('..\bin\smbd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!smbd = exist.1
     end
@@ -73 +97 @@
     if samba.!smbd = "" then call _ErrorBinaryNotFound 'Could not find smbd.exe!'
 
+
     samba.!bin = VRParseFileName(samba.!smbd,'DP')
     IF options.!debug == 1 THEN say '  Samba binaries = "'samba.!bin'"'
+    IF options.!debug == 1 THEN say '  Samba smbd.exe = "'samba.!smbd'"'
 
     /* smb.cmd */
@@ -299 +325 @@
 
 /*:VRX */
-_SambaRunning: procedure expose running. pids. TempDir HaveWinbindd options.
+_SambaRunning: procedure expose running. pids. TempDir HaveWinbindd options. samba.
     IF options.!debug == 1 THEN say '_SambaRunning() started'
 

branches/guitools-1.0/shared/swat.vrs

@@ -15 +15 @@
         end
     end
+    if samba.!htpasswdexe = "" then do /* wellknown locations */
+        WellKnown = SysBootdrive()"\ecs\system\apache2\bin;"SysBootdrive()"\apache2\bin"
+        Programs = value("PROGRAMS",,'OS2ENVIRONMENT')
+        if Programs <> "" then WellKnown = Wellknown';'Programs'\apache2\bin'
+        Tools = value("TOOLS",,'OS2ENVIRONMENT')
+        if Tools <> "" then WellKnown = Wellknown';'Tools'\apache2\bin'
+        call charout , "  Are binaries in wellknown locations? "
+        ok = VRFindFile("htpasswdexe.exe",WellKnown)
+        if ok <> "" then say "Yes."; else say "No."
+        if ok <> "" then samba.!htpasswdexe = ok
+        drop Wellknown Tools Programs
+    end
+
     if samba.!htpasswdexe = "" then do /* in current directory? */
         call charout , "  Is htpasswd.exe in current directory? "
         ok = SysFileTree('.\htpasswd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!htpasswdexe = exist.1
     end
@@ -24 +37 @@
         call charout , "  Is htpasswd.exe in parent directory? "
         ok = SysFileTree('..\htpasswd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!htpasswdexe = exist.1
     end
@@ -30 +43 @@
         call charout , "  Is htpasswd.exe in ..\BIN directory? "
         ok = SysFileTree('..\bin\htpasswd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!htpasswdexe = exist.1
     end
@@ -36 +49 @@
         call charout , "  Is htpasswd.exe in "SysBootDrive()"\apache2\bin path? "
         ok = SysFileTree(SysBootDrive()'\apache2\bin\htpasswd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!htpasswdexe = exist.1
     end
@@ -42 +55 @@
         call charout , "  Is htpasswd.exe in ..\..\apache2\bin path? "
         ok = SysFileTree('..\..\apache2\bin\htpasswd.exe', exist.,'FO')
-        say exist.0' (1 = Yes, 0 = No)'
+        if exist.0 = 1 then say "Yes."; else say "No."
         if exist.0 = 1 then samba.!htpasswdexe = exist.1
     end