From 6ab8173bd29073983486a585d43b33c58cfb37c3 Mon Sep 17 00:00:00 2001
From: Solly Ross <sross@redhat.com>
Date: Tue, 17 Feb 2015 17:54:21 -0500
Subject: [PATCH] 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`.
---
 .gitignore      | 1 +
 utils/launch.sh | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7cf2a2a..a707ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 *.o
 tests/data_*.js
 utils/rebind.so
+utils/websockify
 node_modules
diff --git a/utils/launch.sh b/utils/launch.sh
index 1492bf9..ab9a6ef 100755
--- a/utils/launch.sh
+++ b/utils/launch.sh
@@ -118,8 +118,7 @@ else
     if [[ $? -ne 0 ]]; then
         echo "No installed websockify, attempting to clone websockify..."
         WEBSOCKIFY=${HERE}/websockify/run
-        git clone https://github.com/kanaka/websockify
-        git update-index --assume-unchanged websockify
+        git clone https://github.com/kanaka/websockify ${HERE}/websockify
 
         if [[ ! -e $WEBSOCKIFY ]]; then
             echo "Unable to locate ${HERE}/websockify/run after downloading"