From f86e91bef22564c37658b1f3f9504c002966dc48 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 9 May 2018 09:47:51 +1000
Subject: [PATCH] Updated vulnerable dependancy

---
 bin/gulp             |  2 +-
 bin/npm              |  2 +-
 bin/yarn             | 20 ++++++++++++++++++++
 manager/package.json |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100755 bin/yarn

diff --git a/bin/gulp b/bin/gulp
index 5eff952..ca51616 100755
--- a/bin/gulp
+++ b/bin/gulp
@@ -16,5 +16,5 @@ fi
 
 cd "$CODEBASE"
 
-docker-compose run --no-deps --rm -w /srv/manager app gulp $@
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app gulp $@
 exit $?
diff --git a/bin/npm b/bin/npm
index aaf68ca..7a47795 100755
--- a/bin/npm
+++ b/bin/npm
@@ -16,5 +16,5 @@ fi
 
 cd "$CODEBASE"
 
-docker-compose run --no-deps --rm -w /srv/manager app npm $@
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app npm $@
 exit $?
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 0000000..fe3b1fe
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if hash realpath 2>/dev/null; then
+    export CODEBASE=$(realpath $SCRIPT_DIR/..)
+elif hash grealpath 2>/dev/null; then
+    export CODEBASE=$(grealpath $SCRIPT_DIR/..)
+else
+    export CODEBASE=$(readlink -e $SCRIPT_DIR/..)
+fi
+
+if [ -z "$CODEBASE" ]; then
+    echo "Unable to determine absolute codebase directory"
+    exit 1
+fi
+
+cd "$CODEBASE"
+
+/usr/local/bin/docker-compose run --no-deps --rm -w /srv/manager app yarn $@
+exit $?
diff --git a/manager/package.json b/manager/package.json
index 5508c9e..9f1d42b 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -38,7 +38,7 @@
     "gulp-concat-util": "^0.5.5",
     "gulp-ejs": "^3.0.1",
     "gulp-imagemin": "^3.3.0",
-    "gulp-sass": "^3.2.1",
+    "gulp-sass": "^4.0.1",
     "gulp-util": "^3.0.8",
     "image-size": "^0.6.1",
     "jquery": "^3.2.1",