Merge branch 'subtree/merge/core'

README.md

@@ -9,7 +9,7 @@ During the alpha stage, expect many things to break, not work or simply fail.
 
 #### Creating Plugins ####
 
-The best and easiest way to create plugins is on c9.io. Please check out this tutorial for how to [get started writing plugins.](http://cloud9-sdk.readme.io/v0.1/docs/getting-started)
+The best and easiest way to create plugins is on c9.io. Please check out this tutorial for how to [get started writing plugins.](http://cloud9-sdk.readme.io/v0.1/docs/getting-started-with-cloud9-plugins)
 
 We also have a tutorial for how to get started working on the core plugins. [Check out that tutorial here.](http://cloud9-sdk.readme.io/v0.1/docs/contributing-to-existing-packages)
 
@@ -79,4 +79,4 @@ To protect the interests of the Cloud9 contributors and users we require contrib
 
 If you want to contribute to the Cloud9 SDK and/or open source plugins please go to the online form, fill it out and submit it.
 
-Happy coding, Cloud9
+Happy coding, Cloud9

build/build-local.sh

@@ -24,6 +24,7 @@ case "$uname" in
     *x86_64*) arch=x64 ;;
     *i*86*) arch=x86 ;;
     *armv6l*) arch=arm-pi ;;
+    *armv7l*) arch=arm-pi ;;
 esac
 
 showStatus () { printf "\e[1A\e[0K\r%s\n" $1; }

build/build-standalone.sh

@@ -24,6 +24,7 @@ case "$uname" in
     *x86_64*) arch=x64 ;;
     *i*86*) arch=x86 ;;
     *armv6l*) arch=arm-pi ;;
+    *armv7l*) arch=arm-pi ;;
 esac
 
 showStatus () { printf "\e[1A\e[0K\r%s\n" $1; }

scripts/install-sdk.sh

@@ -18,6 +18,7 @@ case "$uname" in
     *x86_64*) arch=x64 ;;
     *i*86*) arch=x86 ;;
     *armv6l*) arch=arm-pi ;;
+    *armv7l*) arch=arm-pi ;;
 esac
 
 if ! [[ -f ~/.c9/installed ]] && ! [[ $os == "windows" ]]; then
@@ -77,4 +78,4 @@ npm install || true
 
 
 echo "Success!"
-echo "run 'node server.js -p 8181 -l 0.0.0.0' to launch Cloud9"
+echo "run 'node server.js -p 8181 -l 0.0.0.0' to launch Cloud9"

scripts/setup-local-dev.sh

@@ -24,6 +24,7 @@ case "$uname" in
     *x86_64*) arch=x64 ;;
     *i*86*) arch=x86 ;;
     *armv6l*) arch=arm-pi ;;
+    *armv7l*) arch=arm-pi ;;
 esac