[pybot-commits] CVS: pybot/scripts pybotsetup.py,1.2,1.3

[Gustavo N. <nie...@us...>]

Update of /cvsroot/pybot/pybot/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv28749/scripts

Modified Files:
	pybotsetup.py 
Log Message:
Fixed.


Index: pybotsetup.py
===================================================================
RCS file: /cvsroot/pybot/pybot/scripts/pybotsetup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pybotsetup.py	4 Dec 2001 00:57:38 -0000	1.2
--- pybotsetup.py	3 Apr 2002 22:29:51 -0000	1.3
***************
*** 25,31 ****
  import time
  import cPickle
- import pybot
  
  if os.path.isfile("options"):
      file = open("options")
      option = cPickle.load(file)
--- 25,32 ----
  import time
  import cPickle
  
  if os.path.isfile("options"):
+     sys.exit("You already have an options file!")
+     # For the future:
      file = open("options")
      option = cPickle.load(file)
***************
*** 34,37 ****
--- 35,43 ----
      option = {}
  
+ if os.path.isdir("pybot"):
+     sys.path.append(".")
+ 
+ from pybot.user import User
+ 
  try:
      print """
***************
*** 90,95 ****
      sys.exit("Interrupted!")
  
! option["Permission.gosh"] = [pybot.User(nick, username, hostname)]
! option["ServerControl.servers"] = {server:[pybotnick, pybotusername, "0", pybotrealname, []]}
  
  file = open("options", "w")
--- 96,102 ----
      sys.exit("Interrupted!")
  
! option["Permission.gosh"] = [User(nick, username, hostname)]
! option["ServerControl.servers"] = {server:[pybotnick, pybotusername, "0", pybotrealname, {}]}
! option["ModuleControl.modules"] = ["servercontrol", "pong", "permission", "help", "social"]
  
  file = open("options", "w")