Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some cleanup of the launcher info texts.

Browse source
This commit is contained in:
Griatch 2013-05-15 09:10:14 +02:00
parent 51cf5461fa
commit e0c3ee1546
2 changed files with 17 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

37
game/evennia.py
View file

@ -24,28 +24,6 @@ if not os.path.exists('settings.py'):
# this triggers the settings file creation.
import game.manage
print """
... A new settings file was created. Edit this file to configure
Evennia as desired by copy&pasting options from
src/settings_default.py.
You should then also create/configure the database using
python manage.py syncdb
Make sure to create a new admin user when prompted -- this will be
user #1 in-game. If you use django-south, you'll see mentions of
migrating things in the above run. You then also have to run
python manage.py migrate
If you use default sqlite3 database, you will find a file
evennia.db appearing. This is the database file. Just delete this
and repeat the above manage.py steps to start with a fresh
database.
When you are set up, run evennia.py again to start the server."""
sys.exit()
# signal processing
@ -110,7 +88,7 @@ MENU = \
| |
| 5) Reload the Server |
| 6) Reload the Portal (only works in non-daemon mode. If running |
| in daemon mode, Portal needs to be restarted manually (option 1-4)) |
| in daemon mode, Portal needs to be stopped/started manually. |
| |
+--- Stopping (must first be started) --------------------------------------+
| |
@ -163,13 +141,8 @@ except DatabaseError,e:
Please run:
python manage.py syncdb
(make sure to create an admin user when prompted). If you use
pyhon-south you will get mentions of migrating in the above
run. You then need to also run
python manage.py migrate
python manage.py syncdb (create an admin user when prompted)
python manage.py migrate
When you have a database set up, rerun evennia.py.
""" % e
@ -450,9 +423,9 @@ def main():
"""
parser = OptionParser(usage="%prog [-i] [menu|start|reload|stop [server|portal|all]]",
description="""This is the main Evennia launcher. It handles the Portal and Server, the two services making up Evennia. Default is to operate on both services. Use --interactive together with start to launch services as 'interactive'. Note that when launching 'all' services with the --interactive flag, both services will be started, but only Server will actually be started in interactive mode. This is simply because this is the most commonly useful state. To activate interactive mode also for Portal, launch the two services explicitly as two separate calls to this program. You can also use the menu.""")
description="""This is the main Evennia launcher. It handles the Portal and Server, the two services making up Evennia. Default is to operate on both services. Interactive mode sets the service to log to stdout, in the foreground. Note that when launching 'all' services with the \"--interactive\" flag, both services will be started, but only Server will actually be started in interactive mode, simply because this is the most commonly useful setup. To activate interactive mode also for Portal, use the menu or launch the two services explicitly as two separate calls to this program.""")
parser.add_option('-i', '--interactive', action='store_true', dest='interactive', default=False, help="Start given processes in interactive mode (log to stdout, don't start as a daemon).")
parser.add_option('-i', '--interactive', action='store_true', dest='interactive', default=False, help="Start given processes in interactive mode.")
options, args = parser.parse_args()

23
game/manage.py
View file

@ -82,7 +82,10 @@ SECRET_KEY = '%s'
You may edit the settings file now if you like, but if you just
want to quickly get started you don't have to touch anything.
(re)run 'python manage.py syncdb' once you are ready to continue.
Once you are ready to continue, (re)run
python manage.py syncdb
followed by
python manage.py migrate
"""
@ -98,16 +101,14 @@ except Exception:
# note - if this fails, ugettext will also fail, so we cannot translate this string.
string += """\n
Error: Couldn't import the file 'settings.py' in the directory
containing %(file)r. There are usually two reasons for this:
1) You moved your settings.py elsewhere. In that case move it back or
create a link to it from this folder.
2) The settings module is where it's supposed to be, but contains errors.
Review the traceback above to resolve the problem, then try again.
3) If you get errors on finding DJANGO_SETTINGS_MODULE you might have
set up django wrong in some way. If you run a virtual machine, it might be worth
to restart it to see if this resolves the issue. Evennia should not require you
to define any environment variables manually.
Error: Couldn't import the file 'settings.py' in the directory containing %(file)r.
There are usually two reasons for this:
1) The settings module contains errors. Review the traceback above to resolve the
problem, then try again.
2) If you get errors on finding DJANGO_SETTINGS_MODULE you might have set up django
wrong in some way. If you run a virtual machine, it might be worth to restart it
to see if this resolves the issue. Evennia should not require you to define any
environment variables manually.
""" % {'file': __file__}
print string
sys.exit(1)