From 18afbc5becae4c65906d98e2b48ff511524b34aa Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 17 May 2017 18:14:28 +0100 Subject: [PATCH] Make dep install script work --- scripts/fetch-develop.deps.sh | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh index 1a3c09969b..a8abcef150 100755 --- a/scripts/fetch-develop.deps.sh +++ b/scripts/fetch-develop.deps.sh @@ -8,9 +8,6 @@ curbranch=`git rev-parse --abbrev-ref HEAD` -mkdir -p node_modules -cd node_modules - function dodep() { org=$1 repo=$2 @@ -18,10 +15,32 @@ function dodep() { git clone https://github.com/$org/$repo.git $repo pushd $repo git checkout $curbranch || git checkout develop - npm install echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD` popd } dodep matrix-org matrix-js-sdk dodep matrix-org matrix-react-sdk + +mkdir -p node_modules +cd node_modules + +ln -s ../matrix-js-sdk ./ +pushd matrix-js-sdk +npm install +popd + +ln -s ../matrix-react-sdk ./ +pushd matrix-react-sdk +mkdir -p node_modules +cd node_modules +ln -s ../../matrix-js-sdk matrix-js-sdk +cd .. +npm install +popd +# Link the reskindex binary in place: if we used npm link, +# npm would do this for us, but we don't because we'd have +# to define the npm prefix somewhere so it could put the +# intermediate symlinks there. Instead, we do it ourselves. +mkdir -p .bin +ln -s ../matrix-react-sdk/scripts/reskindex.js .bin/reskindex