Merge branch 'master' of github.com:DearDesi/deardesi

This commit is contained in:
AJ ONeal 2015-01-31 00:44:24 -07:00
commit 5bf5214ade
2 changed files with 5 additions and 2 deletions

View File

@ -68,7 +68,7 @@ function init() {
// //
Desi.registerRenderer( Desi.registerRenderer(
'js' 'js'
, require('desirae/lib/render-core').DesiraeRenderCss , require('desirae/lib/render-core').DesiraeRenderJs
, { themes: true, assets: true } , { themes: true, assets: true }
); );
Desi.registerRenderer( Desi.registerRenderer(

View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
if [ -n "" ]; then if [ -n "$(which curl)" ]; then
CMD_CURL="curl -fsSL" CMD_CURL="curl -fsSL"
elif [ -n "$(which wget)" ]; then elif [ -n "$(which wget)" ]; then
CMD_CURL="wget -nv --quiet --no-verbose -O -" CMD_CURL="wget -nv --quiet --no-verbose -O -"
else
echo "Couldn't find 'curl' or 'wget' (that's weird), could not continue."
exit 1
fi fi
echo "" echo ""