shared in install scripts

install_local.sh

@@ -41,9 +41,19 @@ fi
 
 set -e
 set -o pipefail
+npm install
+echo "INSTALLING SHARED..."
+cd shared/
+if [ "$CLEAN" = "true" ]; then
+  echo "  ...deleting node modules";
+  rm -rf node_modules/
+fi
+git checkout develop
+git pull
+npm install
+cd ..
 
 echo "INSTALLING CORE..."
-npm install
 if [ ! -d "cables/" ]; then
   git clone [email protected]:pandrr/cables.git
 fi

update_repos.sh

@@ -21,6 +21,29 @@ fi
 set -e
 set -o pipefail
 
+echo "UPDATING SHARED..."
+cd shared
+if [ -n "${1}" ] && [ "clean" != "${1}" ]; then
+	git checkout "${1}"
+fi
+# get current branch
+branch=`git rev-parse --abbrev-ref HEAD`
+# ignore errors here, since branch might not be on remote
+git fetch || true
+git pull origin "$branch" || true
+# merge current remote develop if branch is not master
+if [ "master" != "${branch}" ]; then
+    echo "merging current state of origin/develop into ${branch}";
+    git merge origin/develop;
+else
+    echo "WARNING: not merging origin/develop into master!"
+fi
+if [ "clean" == "${1}" ]; then
+	rm -rf node_modules/
+fi
+npm i
+cd ..
+
 echo "UPDATING CORE..."
 cd cables
 if [ -n "${1}" ] && [ "clean" != "${1}" ]; then