Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

This commit is contained in:
Blade Barringer 2015-02-17 15:27:27 -06:00
commit e7c7b3f081
3 changed files with 7 additions and 9 deletions

View file

@ -1,8 +1,3 @@
{ {
"directory": "website/public/bower_components", "directory": "website/public/bower_components"
"storage" : {
"packages" : ".bower-cache",
"registry" : ".bower-registry"
},
"tmp" : ".bower-tmp"
} }

3
Vagrantfile vendored
View file

@ -5,6 +5,9 @@
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 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.vm.box = "thepeopleseason/habitrpg"
config.ssh.forward_agent = true config.ssh.forward_agent = true

View file

@ -40,7 +40,7 @@ echo Installing GraphicsMagick - provides gm and convert...
apt-get install -qq graphicsmagick apt-get install -qq graphicsmagick
echo Installing phantomjs and dependency... echo Installing phantomjs and dependency...
apt-get install -qq phantomjs libicu48 apt-get install -qq libicu48
echo Installing requirements for grunt-spritesmith... echo Installing requirements for grunt-spritesmith...
apt-get install -qq pkg-config libcairo2-dev libjpeg-dev apt-get install -qq pkg-config libcairo2-dev libjpeg-dev
@ -63,10 +63,10 @@ apt-get install -qq nodejs
cd /vagrant cd /vagrant
echo Installing grunt/bower... echo Installing grunt/bower...
npm install -g grunt-cli bower npm install -g grunt-cli bower phantomjs
echo Installing HabitRPG echo Installing HabitRPG
npm install npm install --no-bin-link
echo Installing Bower packages echo Installing Bower packages
sudo -H -u vagrant bower --config.interactive=false install -f sudo -H -u vagrant bower --config.interactive=false install -f