Changeset 275

Timestamp:

Jun 17, 2009, 4:18:03 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Updated error checking in SambaInit.vrs

File:

• branches/guitools-1.0/shared/sambainit.vrs (modified) (8 diffs)

branches/guitools-1.0/shared/sambainit.vrs

@@ -11 +11 @@
     /* Error status and file variables */
     ErrorFile  = Tempdir'smbutil.error'
-    ErrorState = 0 /* _ErrorNotFound() changes this variable */
+    ErrorState = 0 /* _ErrorBinaryNotFound() changes this variable */
+    DataErrorState = 0 /* _ErrorDataFileNotFound() changes this variable */
 
     /* Evaluate environment */
@@ -83 +84 @@
     end
 
-    if samba.!smbd = "" then call _ErrorNotFound " could not find smbd.exe!"
+    if samba.!smbd = "" then call _ErrorBinaryNotFound " could not find smbd.exe!"
 
     samba.!bin = VRParseFileName(samba.!smbd,'DP')
@@ -92 +93 @@
     if \VRFileExists(samba.!smbcmd) then do
         samba.!smbcmd = samba.!bin'\smb.cmd'
-        if \VRFileExists(samba.!smbcmd) then call _ErrorNotFound " could not find smb.cmd!"
+        if \VRFileExists(samba.!smbcmd) then call _ErrorBinaryNotFound " could not find smb.cmd!"
     end
     IF options.!debug == 1 THEN say '  smb.cmd        = "'samba.!smbcmd'"'
@@ -98 +99 @@
     /* smbpasswd.exe */
     samba.!smbpasswdexe = samba.!bin'\smbpasswd.exe'
-    if \VRFileExists(samba.!smbpasswdexe) then call _ErrorNotFound " could not find smbpasswd.exe!"
+    if \VRFileExists(samba.!smbpasswdexe) then call _ErrorBinaryNotFound " could not find smbpasswd.exe!"
     IF options.!debug == 1 THEN say '  smbpasswd.exe  = "'samba.!smbpasswdexe'"'
 
     /* pdbedit.exe */
     samba.!pdbeditexe = samba.!bin'\pdbedit.exe'
-    if \VRFileExists(samba.!pdbeditexe) then call _ErrorNotFound " could not find pdbedit.exe!"
+    if \VRFileExists(samba.!pdbeditexe) then call _ErrorBinaryNotFound " could not find pdbedit.exe!"
     IF options.!debug == 1 THEN say '  pdbedit.exe    = "'samba.!pdbeditexe'"'
 
     /* net.exe */
     samba.!netexe = samba.!bin'\net.exe'
-    if \VRFileExists(samba.!netexe) then call _ErrorNotFound " could not find net.exe!"
+    if \VRFileExists(samba.!netexe) then call _ErrorBinaryNotFound " could not find net.exe!"
     IF options.!debug == 1 THEN say '  net.exe        = "'samba.!netexe'"'
 
     /* testparm.exe */
     samba.!testparmexe = samba.!bin'\testparm.exe'
-    if \VRFileExists(samba.!testparmexe) then call _ErrorNotFound " could not find testparm.exe!"
+    if \VRFileExists(samba.!testparmexe) then call _ErrorBinaryNotFound " could not find testparm.exe!"
     IF options.!debug == 1 THEN say '  testparm.exe   = "'samba.!testparmexe'"'
 
     /* smbtree.exe */
     samba.!smbtreeexe = samba.!bin'\smbtree.exe'
-    if \VRFileExists(samba.!smbtreeexe) then call _ErrorNotFound " could not find smbtree.exe!"
+    if \VRFileExists(samba.!smbtreeexe) then call _ErrorBinaryNotFound " could not find smbtree.exe!"
     IF options.!debug == 1 THEN say '  smbtree.exe    = "'samba.!smbtreeexe'"'
 
     /* smbstatus.exe */
     samba.!smbstatusexe = samba.!bin'\smbstatus.exe'
-    if \VRFileExists(samba.!smbstatusexe) then call _ErrorNotFound " could not find smbstatus.exe!"
+    if \VRFileExists(samba.!smbstatusexe) then call _ErrorBinaryNotFound " could not find smbstatus.exe!"
     IF options.!debug == 1 THEN say '  smbstatus.exe  = "'samba.!smbstatusexe'"'
 
     /* smbcontrol.exe */
     samba.!smbcontrolexe = samba.!bin'\smbcontrol.exe'
-    if \VRFileExists(samba.!smbcontrolexe) then call _ErrorNotFound " could not find smbcontrol.exe!"
+    if \VRFileExists(samba.!smbcontrolexe) then call _ErrorBinaryNotFound " could not find smbcontrol.exe!"
     IF options.!debug == 1 THEN say '  smbcontrol.exe = "'samba.!smbcontrolexe'"'
 
     /* smbclient.exe */
     samba.!smbclientexe = samba.!bin'\smbclient.exe'
-    if \VRFileExists(samba.!smbclientexe) then call _ErrorNotFound " could not find smbclient.exe!"
+    if \VRFileExists(samba.!smbclientexe) then call _ErrorBinaryNotFound " could not find smbclient.exe!"
     IF options.!debug == 1 THEN say '  smbclient.exe  = "'samba.!smbclientexe'"'
 
@@ -158 +159 @@
     end
 
-    if samba.!pwd_mkdb = "" then call _ErrorNotFound " could not find pwd_mkdb.exe!"
+    if samba.!pwd_mkdb = "" then call _ErrorBinaryNotFound " could not find pwd_mkdb.exe!"
     IF options.!debug == 1 THEN say '  pwd_mkdb.exe   = "'samba.!pwd_mkdb'"'
 
@@ -175 +176 @@
     end
 
-    if samba.!log = "" then call _ErrorNotFound " could not find logfiles!"
+    if samba.!log = "" then call _ErrorDataFileNotFound " could not find logfiles!"
     IF options.!debug == 1 THEN say '  Samba logfiles = "'samba.!log'"'
 
     /* smb.conf */
     samba.!smbconf = ETC'\samba\smb.conf'
-    ok = stream(samba.!smbconf,'c','query exists')
-    if ok = "" then do
-        call _ErrorNotFound samba.!smbconf' is not present.'
-    end
+    if \VRFileExists(samba.!smbconf) then call _ErrorDataFileNotFound samba.!smbconf' is not present.'
     IF options.!debug == 1 THEN say '  Samba smb.conf = "'samba.!smbconf'"'
 
@@ -189 +187 @@
     /* the password files - we'll create them if they don't exist */
     samba.!masterpasswd = unixetc'\master.passwd'
+    if \VRFileExists(samba.!masterpasswd) then call _ErrorDataFileNotFound " could not find master.passwd!"
     IF options.!debug == 1 THEN say '  master.passwd  = "'samba.!masterpasswd'"'
-    if \VRFileExists(samba.!masterpasswd) then call _ErrorNotFound " could not find master.passwd!"
 
     samba.!pwddb = unixetc'\pwd.db'
+    if \VRFileExists(samba.!pwddb) then call _ErrorDataFileNotFound " could not find pwd.db!"
     IF options.!debug == 1 THEN say '  pwd.db         = "'samba.!pwddb'"'
-    if \VRFileExists(samba.!pwddb) then call _ErrorNotFound " could not find pwd.db!"
 
     samba.!spwddb = unixetc'\spwd.db'
+    if \VRFileExists(samba.!spwddb) then call _ErrorDataFileNotFound " could not find spwd.db!"
     IF options.!debug == 1 THEN say '  spwd.db        = "'samba.!spwddb'"'
-    if \VRFileExists(samba.!spwddb) then call _ErrorNotFound " could not find spwd.db!"
 
     samba.!group = unixetc'\group'
+    if \VRFileExists(samba.!group) then call _ErrorDataFileNotFound " could not find "samba.!group"!"
     IF options.!debug == 1 THEN say '  group          = "'samba.!group'"'
-    if \VRFileExists(samba.!group) then call _ErrorNotFound " could not find "samba.!group"!"
 
     samba.!printcap = unixetc'\printcap'
+    if \VRFileExists(samba.!spwddb) then call _ErrorDataFileNotFound " could not find printcap!"
     IF options.!debug == 1 THEN say '  printcap       = "'samba.!printcap'"'
-    if \VRFileExists(samba.!spwddb) then call _ErrorNotFound " could not find printcap!"
 
     /* Create this directory tree if it does not exist */
@@ -239 +237 @@
     /* Do some very basic housekeeping when leaving */
     ok = stream(samba.!msg,'c','close')
-    ok = stream(samba.!err,'c','close')
+    ok = stream(samba.!error,'c','close')
     ok = SysFileDelete(samba.!msg)
-    ok = SysFileDelete(samba.!err)
+    ok = SysFileDelete(samba.!error)
 return
 
 /*:VRX */
-_ErrorNotFound: 
+_ErrorBinaryNotFound: 
     /* Set error status variable and show a short message - incomplete! */
     msg = arg(1)
     say "ERROR: "msg
+    id = VRMessage( VRWindow(), msg, "Samba Installation", "E" )
     ErrorState = (1|ErrorState)
+return
+
+/*:VRX */
+_ErrorDataFileNotFound: 
+    /* Set error status variable and show a short message - incomplete! */
+    msg = arg(1)
+    say "ERROR: "msg
+    DataErrorState = (1|DataErrorState)
 return