Kaynağa Gözat

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`.
Solly Ross 10 yıl önce
ebeveyn
işleme
9db6a90677
2 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 1 0
      .gitignore
  2. 1 2
      utils/launch.sh

+ 1 - 0
.gitignore

@@ -2,4 +2,5 @@
 *.o
 tests/data_*.js
 utils/rebind.so
+utils/websockify
 node_modules

+ 1 - 2
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"