diff options
| author | Solly Ross <sross@redhat.com> | 2015-02-17 17:54:21 -0500 |
|---|---|---|
| committer | Solly Ross <sross@redhat.com> | 2015-02-17 17:54:21 -0500 |
| commit | 9db6a906770d188a855de41787d6fedd4def5691 (patch) | |
| tree | 306e0b0c7c03b9a93bbab3343a5b49efe631943a | |
| parent | 5cd6de495f25b6f7edf6097fa12f8d6f5385cc61 (diff) | |
| download | novnc-9db6a906770d188a855de41787d6fedd4def5691.tar.gz | |
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`.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | utils/launch.sh | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -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" |