diff --git a/scripts/install-sdk.sh b/scripts/install-sdk.sh
index 52fb07b9..739ae5e7 100755
--- a/scripts/install-sdk.sh
+++ b/scripts/install-sdk.sh
@@ -15,8 +15,8 @@ else
   exit 1
 fi
 
-cd `dirname $0`/..
-SOURCE=`pwd`
+cd "$(dirname "$0")/.."
+SOURCE=$(pwd)
 
 uname="$(uname -a)"
 os=
@@ -44,37 +44,38 @@ blue=$'\e[01;34m'
 magenta=$'\e[01;35m'
 resetColor=$'\e[0m'
 
-NO_PULL=
-NO_GLOBAL_INSTALL=
-FORCE=
+# NO_PULL=
+# NO_GLOBAL_INSTALL=
+# FORCE=
 
 updatePackage() {
     name=$1
+    cd "$SOURCE"
     
     REPO=https://github.com/c9/$name
     echo "${green}checking out ${resetColor}$REPO"
     
-    if ! [[ -d ./plugins/$name ]]; then
-        mkdir -p ./plugins/$name
+    if ! [[ -d ./plugins/"$name" ]]; then
+        mkdir -p ./plugins/"$name"
     fi
     
-    pushd ./plugins/$name
+    pushd ./plugins/"$name"
     if ! [[ -d .git ]]; then
         git init
         # git remote rm origin || true
-        git remote add origin $REPO
+        git remote add origin "$REPO"
     fi
     
-    version=`"$NODE" -e 'console.log((require("../../package.json").c9plugins["'$name'"].substr(1) || "origin/master"))'`;
-    rev=`git rev-parse --revs-only $version`
+    version=$("$NODE" -e 'console.log((require("../../package.json").c9plugins["'"$name"'"].substr(1) || "origin/master"))');
+    rev=$(git rev-parse --revs-only "$version")
     
     if [ "$rev" == "" ]; then
         git fetch origin
     fi
     
-    status=`git status --porcelain --untracked-files=no`
-    if [ "$status" == "" ]; then
-        git reset $version --hard
+    status=$(git status --porcelain --untracked-files=no)
+    if [ "$status" == "" ] || [ "$FORCE" == "1" ]; then
+        git reset "$version" --hard
     else
         echo "${yellow}$name ${red}contains uncommited changes.${yellow} Skipping...${resetColor}"
     fi
@@ -82,22 +83,23 @@ updatePackage() {
 }
 
 updateAllPackages() {
-    c9packages=`"$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))'`;
+    c9packages=$("$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))');
     count=${#c9packages[@]}
     i=0
-    for m in ${c9packages[@]}; do echo $m; 
-        i=$(($i + 1))
+    for m in "${c9packages[@]}"; do
+        echo "$m" 
+        i=$((i + 1))
         echo "updating plugin ${blue}$i${resetColor} of ${blue}$count${resetColor}"
-        updatePackage $m
+        updatePackage "$m" || updatePackage "$m"
     done
 }
 
 updateNodeModules() {
     echo "${magenta}--- Running npm install --------------------------------------------${resetColor}"
     safeInstall(){
-        deps=`"$NODE" -e 'console.log(Object.keys(require("./package.json").dependencies).join(" "))'`;
-        for m in ${deps[@]}; do echo $m; 
-            "$NPM" install --loglevel warn $m || true
+        deps=$("$NODE" -e 'console.log(Object.keys(require("./package.json").dependencies).join(" "))');
+        for m in "${deps[@]}"; do echo "$m"; 
+            "$NPM" install --loglevel warn "$m"
         done
     }
     "$NPM" install || safeInstall
@@ -144,7 +146,7 @@ installGlobalDeps() {
 
 ############################################################################
 export C9_DIR="$HOME"/.c9
-if ! [[ `which npm` ]]; then
+if ! [[ $(which npm) ]]; then
     if [[ $os == "windows" ]]; then
         export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH"
     else