From 674c7ea75af5f26ef574ed403bbba9f89ec2344a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Mon, 17 Jun 2019 14:56:28 +0200 Subject: Replace zipinfo(1) by `unzip -l` The output is the same between those two commands. The benefit is that it avoids the need to install the `unzip` package on FreeBSD and all systems where the default unzip(1) is provided by libarchive. --- test/plugin_escript.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/plugin_escript.mk b/test/plugin_escript.mk index f80db46..3949547 100644 --- a/test/plugin_escript.mk +++ b/test/plugin_escript.mk @@ -63,7 +63,7 @@ escript-build-deps: init $t $(APP)/$(APP) | grep -q good $i "Check that the escript does not contain the build dependency" - $t ! zipinfo $(APP)/$(APP) 2> /dev/null | grep -q lfe + $t ! unzip -l $(APP)/$(APP) 2> /dev/null | grep -q lfe escript-deps: init @@ -88,7 +88,7 @@ escript-deps: init $t $(APP)/$(APP) | grep -q good $i "Check that the escript contains the dependency" - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q ranch + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q ranch escript-deps-with-deps: init @@ -116,9 +116,9 @@ escript-deps-with-deps: init $t $(APP)/$(APP) | grep -q good $i "Check that the escript contains the dependencies" - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q cowboy - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q cowlib - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q ranch + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q cowboy + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q cowlib + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q ranch escript-distclean: init @@ -173,5 +173,5 @@ escript-extra: init $t $(APP)/$(APP) | grep -q good $i "Check that the escript contains the extra files" - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q Makefile - $t zipinfo $(APP)/$(APP) 2> /dev/null | grep -q erlang.mk + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q Makefile + $t unzip -l $(APP)/$(APP) 2> /dev/null | grep -q erlang.mk -- cgit v1.2.3