Merge pull request #50 from borntyping/master

Submodules, .gitignore, minor fix.
This commit is contained in:
Luke Slater 2012-07-17 06:28:49 -07:00
commit da8f9ea20f
6 changed files with 20 additions and 4 deletions

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
# Ignore the user config files
config.json
# Ignore the user database
db.json

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "jsbot"]
path = jsbot
url = git://github.com/reality/jsbot.git

View File

@ -14,10 +14,17 @@ writing documentation.
Requirements:
- Node JS
- [JSBot](http://github.com/reality/JSBot "JSBot"), the Javascript library I
wrote to handle the IRC protocol and event listeners etc.
- [JSBot](http://github.com/reality/JSBot "JSBot"), a Javascript library which
handles the IRC protocol.
- Various modules have their own requirements also.
### JSBot
JSBot can be imported by running the following commands in the cloned repository:
git submodule init
git submodule update
## Modules:
### Command

View File

@ -11,5 +11,5 @@
]
}
},
"admin": [ "batman" ],
"admin": [ "batman" ]
}

1
jsbot Submodule

@ -0,0 +1 @@
Subproject commit 43b90e24b9293029f6ef4362304fb127e4f1530c

2
run.js
View File

@ -1,6 +1,6 @@
var fs = require('fs');
var timers = require('./timer');
var jsbot = require('./jsbot');
var jsbot = require('./jsbot/jsbot');
require('./snippets');
var DBot = function(timers) {