Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed sudo from npm install and provides a check instead #178

Merged
merged 4 commits into from
Apr 10, 2015
+14 −1
Merged

removed sudo from npm install and provides a check instead #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d75e33
removed sudo from npm install and provides a check instead
rctoris Apr 9, 2015
ad7f9c3
fixed travis build
rctoris Apr 9, 2015
e7d479e
makes install.sh executable
rctoris Apr 9, 2015
57a21e9
check for local install of cairo
rctoris Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ before_install:
- npm install -g npm
- npm install -g grunt-cli karma-cli

# install the dev packages we need
- ./misc/install.sh

# Set up Xfvb for Firefox headless testing
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
Expand Down
10 changes: 10 additions & 0 deletions misc/check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

# check for libcairo2
if [ -f /usr/include/cairo/cairo.h ] || [ -f /usr/local/include/cairo/cairo.h ]; then
echo libcairo2 dev files found.
exit 0
else
echo "\033[31m"libcairo2 dev files not found. Please run misc/install.sh to install the necessary packages."\033[0m" >&2
exit 1
fi
Empty file modified misc/install.sh
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"test-examples": "grunt mochaTest:examples && karma start test/examples/karma.conf.js",
"test-tcp": "grunt mochaTest:tcp",
"publish": "grunt build",
"preinstall": "sh misc/install.sh"
"preinstall": "sh misc/check.sh"
},
"repository": {
"type": "git",
Expand Down