diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-27 20:19:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 20:19:05 (GMT) |
| commit | cc044036983744758009a2c0b83b2a17f9ecfa8f (patch) | |
| tree | dbf0b5ca361e1cd4c38d71946b00ee112cf4aefd /plugins/luarocks/luarocks.mk | |
| parent | a042a228fabbf34936072aa60b43f6b203cfa417 (diff) | |
| parent | 953d7c3f0c85564466048853171742b372d98694 (diff) | |
| download | mxe-cc044036983744758009a2c0b83b2a17f9ecfa8f.zip mxe-cc044036983744758009a2c0b83b2a17f9ecfa8f.tar.gz mxe-cc044036983744758009a2c0b83b2a17f9ecfa8f.tar.bz2 | |
Merge pull request #1545 from LuaAndC/luarocks-remove-lockdir
luarocks wrapper: remove lock if failed
Diffstat (limited to 'plugins/luarocks/luarocks.mk')
| -rw-r--r-- | plugins/luarocks/luarocks.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk index 35ddb04..75bfc02 100644 --- a/plugins/luarocks/luarocks.mk +++ b/plugins/luarocks/luarocks.mk @@ -49,8 +49,10 @@ define $(PKG)_BUILD_SHARED echo ' echo "Waiting for $(PREFIX)/$(TARGET)/lib/luarocks/lock.dir to lock"'; \ echo ' sleep 5'; \ echo 'done'; \ - echo '"$(PREFIX)/$(TARGET)/bin/luarocks.lua" "$$@"'; \ + echo 'result=0'; \ + echo '"$(PREFIX)/$(TARGET)/bin/luarocks.lua" "$$@" || result=$$?'; \ echo 'rmdir "$(PREFIX)/$(TARGET)/lib/luarocks/lock.dir"'; \ + echo 'exit $$result'; \ ) \ > '$(PREFIX)/$(TARGET)/bin/luarocks' chmod 0755 '$(PREFIX)/$(TARGET)/bin/luarocks' |