Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-16 07:29:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #641 from nyuszika7h/patch/supybot-wizard-fixes

Browse Source 
Fixes for supybot-wizard
This commit is contained in:
Valentin Lorentz 2014-05-17 12:55:26 +02:00
commit fca6bf8b0a
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/supybot-wizard
View File

@ -351,8 +351,9 @@ def main():
while not network: while not network:
output("""First, we need to know the name of the network you'd like to output("""First, we need to know the name of the network you'd like to
connect to. Not the server host, mind you, but the name of the connect to. Not the server host, mind you, but the name of the
network. If you plan to connect to irc.freenode.net, for instance, you network. If you plan to connect to chat.freenode.net, for instance,
should answer this question with 'freenode' (without the quotes).""") you should answer this question with 'freenode' (without the quotes).
""")
network = something('What IRC network will you be connecting to?') network = something('What IRC network will you be connecting to?')
if '.' in network: if '.' in network:
output("""There shouldn't be a '.' in the network name. Remember, output("""There shouldn't be a '.' in the network name. Remember,
@ -385,9 +386,17 @@ def main():
ip = 'no network available' ip = 'no network available'
output("""Found %s (%s).""" % (serverString, ip)) output("""Found %s (%s).""" % (serverString, ip))
output("""IRC Servers almost always accept connections on port
6667. They can, however, accept connections anywhere their admins if advanced:
feel like they wants to accept connections from.""") # conf.supybot.networks.<network>.ssl
output("""Some servers allow you to use a secure connection via SSL.
This requires having pyOpenSSL installed.""")
if yn('Do you want to use an SSL connection?', default=False):
network.ssl.setValue(True)
output("""IRC servers almost always accept connections on port
6667 (or 6697 when using SSL). They can, however, accept connections
anywhere their admins feel like they want to accept connections from.""")
if yn('Does this server require connection on a non-standard port?', if yn('Does this server require connection on a non-standard port?',
default=False): default=False):
port = 0 port = 0
@ -400,6 +409,9 @@ def main():
except ValueError: except ValueError:
output("""That's not a valid port.""") output("""That's not a valid port.""")
port = 0 port = 0
else:
if network.ssl.value:
port = 6697
else: else:
port = 6667 port = 6667
server = ':'.join([serverString, str(port)]) server = ':'.join([serverString, str(port)])
@ -447,15 +459,6 @@ def main():
else: else:
conf.supybot.ident.set(defaultIdent) conf.supybot.ident.set(defaultIdent)
if advanced:
# conf.supybot.networks.<network>.ssl
output("""Some servers allow you to use a secure connection via SSL.
This requires having pyOpenSSL installed. Currently, you also need
Twisted installed as only the Twisted drivers supports SSL
connections.""")
if yn('Do you want to use an SSL connection?', default=False):
network.ssl.setValue(True)
# conf.supybot.networks.<network>.password # conf.supybot.networks.<network>.password
output("""Some servers require a password to connect to them. Most output("""Some servers require a password to connect to them. Most
public servers don't. If you try to connect to a server and for some public servers don't. If you try to connect to a server and for some