Changeset 451 for branches/guitools-1.0/shared/swat.vrs

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

File:

• branches/guitools-1.0/shared/swat.vrs (modified) (5 diffs)

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