Commit 9db6a906 authored by Solly Ross's avatar Solly Ross

Make sure websockify is cloned to the correct dir

When `utils/launch.sh` clones websockify, it can be cloned
into the incorrect directory, depending on how `utils/launch.sh`
is run.  This commit ensures that websockify is always cloned into
`utils/websockify`.
parent 5cd6de49
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
*.o *.o
tests/data_*.js tests/data_*.js
utils/rebind.so utils/rebind.so
utils/websockify
node_modules node_modules
...@@ -118,8 +118,7 @@ else ...@@ -118,8 +118,7 @@ else
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "No installed websockify, attempting to clone websockify..." echo "No installed websockify, attempting to clone websockify..."
WEBSOCKIFY=${HERE}/websockify/run WEBSOCKIFY=${HERE}/websockify/run
git clone https://github.com/kanaka/websockify git clone https://github.com/kanaka/websockify ${HERE}/websockify
git update-index --assume-unchanged websockify
if [[ ! -e $WEBSOCKIFY ]]; then if [[ ! -e $WEBSOCKIFY ]]; then
echo "Unable to locate ${HERE}/websockify/run after downloading" echo "Unable to locate ${HERE}/websockify/run after downloading"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment