Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Remember the basedir when we prompt users for their directories and wrap

Browse Source 
the prompts a little tighter.
This commit is contained in:
James Vega 2004-06-19 19:02:06 +00:00
parent 61d6e029b1
commit 233174d9ce
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/supybot-wizard
View File

@ -84,11 +84,11 @@ def clearLoadedPlugins(plugins, pluginRegistry):
continue continue
_windowsVarRe = re.compile(r'%(\w+)%') _windowsVarRe = re.compile(r'%(\w+)%')
def getDirectoryName(default): def getDirectoryName(default, basedir=os.curdir):
done = False done = False
while not done: while not done:
dir = something('What directory do you want to use?', dir = something('What directory do you want to use?',
default=os.path.join(os.curdir, default)) default=os.path.join(basedir, default))
dir = os.path.expanduser(dir) dir = os.path.expanduser(dir)
dir = _windowsVarRe.sub(r'$\1', dir) dir = _windowsVarRe.sub(r'$\1', dir)
dir = os.path.expandvars(dir) dir = os.path.expandvars(dir)
@ -206,6 +206,7 @@ def main():
except KeyError: except KeyError:
logDir = getDirectoryName('logs') logDir = getDirectoryName('logs')
conf.supybot.directories.log.setValue(logDir) conf.supybot.directories.log.setValue(logDir)
basedir = os.path.dirname(logDir)
# conf.supybot.directories.data # conf.supybot.directories.data
output("""Your bot will need to put various data somewhere. Things like output("""Your bot will need to put various data somewhere. Things like
@ -215,9 +216,9 @@ def main():
try: try:
dataDir = registry._cache['supybot.directories.data'] dataDir = registry._cache['supybot.directories.data']
dataDir = utils.safeEval(dataDir) dataDir = utils.safeEval(dataDir)
dataDir = getDirectoryName(dataDir) dataDir = getDirectoryName(dataDir, basedir=basedir)
except KeyError: except KeyError:
dataDir = getDirectoryName('data') dataDir = getDirectoryName('data', basedir=basedir)
conf.supybot.directories.data.setValue(dataDir) conf.supybot.directories.data.setValue(dataDir)
# conf.supybot.directories.conf # conf.supybot.directories.conf
@ -228,9 +229,9 @@ def main():
try: try:
confDir = registry._cache['supybot.directories.conf'] confDir = registry._cache['supybot.directories.conf']
confDir = utils.safeEval(confDir) confDir = utils.safeEval(confDir)
confDir = getDirectoryName(confDir) confDir = getDirectoryName(confDir, basedir=basedir)
except KeyError: except KeyError:
confDir = getDirectoryName('conf') confDir = getDirectoryName('conf', basedir=basedir)
conf.supybot.directories.conf.setValue(confDir) conf.supybot.directories.conf.setValue(confDir)
# pluginDirs # pluginDirs
@ -243,7 +244,7 @@ def main():
output(utils.commaAndify(pluginDirs)) output(utils.commaAndify(pluginDirs))
while yn('Would you like to add another plugin directory?', while yn('Would you like to add another plugin directory?',
default=False): default=False):
pluginDir = getDirectoryName('plugins') pluginDir = getDirectoryName('plugins', basedir=basedir)
if pluginDir not in pluginDirs: if pluginDir not in pluginDirs:
pluginDirs.append(pluginDir) pluginDirs.append(pluginDir)
conf.supybot.directories.plugins.setValue(pluginDirs) conf.supybot.directories.plugins.setValue(pluginDirs)
@ -451,7 +452,6 @@ def main():
output("""Although supybot offers a supybot-adduser.py script, with which output("""Although supybot offers a supybot-adduser.py script, with which
you can add users to your bot's user database, it's *very* important that you can add users to your bot's user database, it's *very* important that
you have an owner user for you bot.""") you have an owner user for you bot.""")
print '***', conf.supybot.directories.conf()
if yn('Would you like to add an owner user for your bot?', default=True): if yn('Would you like to add an owner user for your bot?', default=True):
import ircdb import ircdb
name = something('What should the owner\'s username be?') name = something('What should the owner\'s username be?')

2
src/questions.py
View File

@ -44,7 +44,7 @@ useBold = False
def output(s, unformatted=True): def output(s, unformatted=True):
if unformatted: if unformatted:
s = textwrap.fill(utils.normalizeWhitespace(s)) s = textwrap.fill(utils.normalizeWhitespace(s), width=65)
print s print s
print print