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

setup.sh

@@ -6,6 +6,29 @@ elif [ -n "$(which wget)" ]; then
   CMD_CURL="wget -nv --quiet --no-verbose -O -"
 fi
 
-$CMD_CURL bit.ly/iojs-min | bash
+echo "Downloading Desi's io.js runtime"
+$CMD_CURL bit.ly/iojs-min | bash > /dev/null
 
-npm install -g desi
+echo "Installing Desi"
+rm -f npm-debug.log
+npm install -g desi >/dev/null 2>/dev/null
+if [ -f npm-debug.log ]; then
+  echo ""
+  echo "Something went wrong"
+  echo "."
+  sleep 1
+  echo "."
+  sleep 1
+  echo "."
+  sleep 1
+  cat npm-debug.log
+fi
+echo "To create your blog run this (change my-blog to whatever name you like):"
+echo ""
+echo "\tdesi init -d ~/Desktop/my-blog"
+echo ""
+echo "To open the directory and see the files, run this:"
+echo ""
+echo "\topen ~/Desktop/my-blog"
+echo ""
+echo ""

views/about/about.html

@@ -21,11 +21,11 @@
             <pre>
 <code>curl -fsSL bit.ly/install-deardesi | bash
 
-desi init -d ~/my-blog
+desi init -d ~/Desktop/my-blog
 
-open ~/my-blog
+open ~/Desktop/my-blog
 
-desi serve -d ~/my-blog</code>
+desi serve -d ~/Desktop/my-blog</code>
             </pre>
             <br/>
             <p>The open <a href="http://local.dear.desi:65080">http://local.dear.desi:65080</a></p> in your browser.