openstack/deb-novnc
Code Issues Proposed changes

Make sure websockify is cloned to the correct dir

Browse Source 
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`.
This commit is contained in:
Solly Ross
2015-02-17 17:54:21 -05:00
parent 79493f6a6b
commit 6ab8173bd2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

3
utils/launch.sh
View File

@@ -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"