From 0584a8475548e469cf061a3c95fd44538276783c Mon Sep 17 00:00:00 2001 From: Sam Clements Date: Tue, 17 Jul 2012 14:08:11 +0100 Subject: [PATCH 1/4] Valid JSON. --- config.json.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json.sample b/config.json.sample index 78dd1cc..8603c24 100644 --- a/config.json.sample +++ b/config.json.sample @@ -11,5 +11,5 @@ ] } }, - "admin": [ "batman" ], + "admin": [ "batman" ] } From 09b0c3daa048cf697a63f4fd645a100104712d1e Mon Sep 17 00:00:00 2001 From: Sam Clements Date: Tue, 17 Jul 2012 14:10:58 +0100 Subject: [PATCH 2/4] Submodules, f--k yeah! --- .gitmodules | 3 +++ jsbot | 1 + run.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 jsbot diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0d17ed4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "jsbot"] + path = jsbot + url = git://github.com/reality/jsbot.git diff --git a/jsbot b/jsbot new file mode 160000 index 0000000..43b90e2 --- /dev/null +++ b/jsbot @@ -0,0 +1 @@ +Subproject commit 43b90e24b9293029f6ef4362304fb127e4f1530c diff --git a/run.js b/run.js index 8958783..4797e6d 100644 --- a/run.js +++ b/run.js @@ -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) { From 074c5f6398b0ef4cc586084ebda469dbf49b9c50 Mon Sep 17 00:00:00 2001 From: Sam Clements Date: Tue, 17 Jul 2012 14:13:30 +0100 Subject: [PATCH 3/4] Added submodule documentation --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7383937..698566e 100644 --- a/README.md +++ b/README.md @@ -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 From a58e73159980f2a7f613cac6ff91b96c73cf3b6a Mon Sep 17 00:00:00 2001 From: Sam Clements Date: Tue, 17 Jul 2012 14:14:38 +0100 Subject: [PATCH 4/4] Added a gitignore file to ignore user files --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1a7610d --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# Ignore the user config files +config.json + +# Ignore the user database +db.json