add ENV["HAVE_INFOZIP"] option to support userimg.jl build

samoconnor · Jun 20, 2016 · 3e678b3 · 3e678b3
1 parent ac9c166
commit 3e678b3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/InfoZIP.jl b/src/InfoZIP.jl
@@ -13,18 +13,20 @@ Base.read(cmd::Cmd) = readbytes(cmd)
 end
 
 
-have_infozip = false
-try
-    if ismatch(r"^UnZip.*by Info-ZIP.", readstring(`unzip`))
-        have_infozip = true
+have_infozip() = haskey(ENV, "HAVE_INFOZIP") || try
+    ismatch(r"^UnZip.*by Info-ZIP.", readstring(`unzip`))
+catch ex
+    if isa(ex, Base.UVError) && ex.code == Base.UV_ENOENT
+        return false
     end
-catch
+    rethrow(ex)
 end
 
 
-if have_infozip
+if have_infozip()
     include("info_zip.jl")
 else
+    warn("InfoZIP falling back to ZipFile.jl backend!")
     include("zip_file.jl")
 end