From 953d7c3f0c85564466048853171742b372d98694 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 23 Oct 2016 02:20:26 +0300 Subject: [PATCH] luarocks wrapper: remove lock if failed Luarocks wrapper used to keep lock dir not removed if luarocks process failed. To run it again, the lock directory should have been removed manually. --- plugins/luarocks/luarocks.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk index 35ddb047..75bfc026 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'