Merge branch 'master' of .git into api

This commit is contained in:
Peter 'Pita' Martischka 2011-08-09 11:14:18 +01:00
commit a850de5532
1 changed files with 4 additions and 1 deletions

View File

@ -33,7 +33,10 @@ if [ ! -f "settings.json" ]; then
fi fi
echo "Ensure that all dependencies are up to date..." echo "Ensure that all dependencies are up to date..."
npm install || rm -rf node_modules; exit 1 npm install || {
rm -rf node_modules
exit 1
}
echo "Ensure jQuery is downloaded and up to date..." echo "Ensure jQuery is downloaded and up to date..."
DOWNLOAD_JQUERY="true" DOWNLOAD_JQUERY="true"