Skip to content

Commit

Permalink
Removes custom bower directories
Browse files Browse the repository at this point in the history
Updates Vagrantfile with correct symlink configuration option
Switches bower/grunt in postinstall script to use the globals
Changes phantomjs to an npm package install
adds --no-bin-link to npm install
  • Loading branch information
ojintoad committed Feb 15, 2015
1 parent db97c74 commit 1c317b0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
7 changes: 1 addition & 6 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"directory": "website/public/bower_components",
"storage" : {
"packages" : ".bower-cache",
"registry" : ".bower-registry"
},
"tmp" : ".bower-tmp"
"directory": "website/public/bower_components"
}
3 changes: 3 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
VAGRANTFILE_API_VERSION = "2"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provider "virtualbox" do |v|
v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
end
config.vm.box = "thepeopleseason/habitrpg"
config.ssh.forward_agent = true

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"scripts": {
"test": "./test/run_tests.sh",
"start": "grunt run:dev",
"postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt;",
"postinstall": "bower --config.interactive=false install -f; grunt;",
"coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ echo Installing GraphicsMagick - provides gm and convert...
apt-get install -qq graphicsmagick

echo Installing phantomjs and dependency...
apt-get install -qq phantomjs libicu48
apt-get install -qq libicu48

echo Installing requirements for grunt-spritesmith...
apt-get install -qq pkg-config libcairo2-dev libjpeg-dev
Expand All @@ -63,10 +63,10 @@ apt-get install -qq nodejs
cd /vagrant

echo Installing grunt/bower...
npm install -g grunt-cli bower
npm install -g grunt-cli bower phantomjs

echo Installing HabitRPG
npm install
npm install --no-bin-link

echo Installing Bower packages
sudo -H -u vagrant bower --config.interactive=false install -f
Expand Down

0 comments on commit 1c317b0

Please sign in to comment.