Skip to content

Commit

Permalink
Merge pull request #1314 from ProjectMirador/local-grunt
Browse files Browse the repository at this point in the history
Simplify install instructions by removing global grunt-cli ref
  • Loading branch information
aeschylus committed Mar 2, 2017
2 parents b07d3c2 + bd6f298 commit 387110d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
Mirador uses [node.js](http://nodejs.org/) and a build system to assemble, test, and manage the development resources. If you have never used these tools before, you may need to install them.

1. Install Node, if you haven't already (available at the link above)
2. Install the Grunt command line runner (if you haven't already); on the command line, run `npm install -g grunt-cli`
3. Clone the mirador repository (if you haven't already done so above); `git clone https://github.com/ProjectMirador/mirador.git`
4. On the command line, go into the mirador folder
5. Install all dependencies with `npm install`. Run `npm start`
1. Clone the mirador repository (if you haven't already done so above); `git clone https://github.com/ProjectMirador/mirador.git`
1. On the command line, go into the mirador folder
1. Install all dependencies with `npm install`. Run `npm start`

`npm start` will run a local server that is available at `localhost:8000`.

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
Mirador uses [node.js](http://nodejs.org/) and a build system to assemble, test, and manage the development resources. If you have never used these tools before, you may need to install them.

1. Install Node, if you haven't already (available at the link above)
2. Install the Grunt command line runner (if you haven't already); on the command line, run `npm install -g grunt-cli`
3. Clone the mirador repository (if you haven't already done so above)
4. On the command line, go into the mirador folder
5. Install all dependencies with `npm install`. Run `npm start'.
1. Clone the mirador repository (if you haven't already done so above)
1. On the command line, go into the mirador folder
1. Install all dependencies with `npm install`. Run `npm start'.

### Run Tests
`npm test`
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"sinon": "^1.17.6"
},
"scripts": {
"start": "grunt serve",
"start": "./node_modules/.bin/grunt serve",
"test": "./node_modules/.bin/karma start ./karma.conf.js",
"travis": "./node_modules/grunt-cli/bin/grunt ci --verbose --force & npm run test"
"travis": "./node_modules/.bin/grunt ci --verbose --force & npm run test"
},
"dependencies": {
"bootbox": "^4.4.0",
Expand Down

0 comments on commit 387110d

Please sign in to comment.