From cb4317d64bde7a11061639bc8746ed7ce781ff6f Mon Sep 17 00:00:00 2001 From: Matthew Churilla Date: Fri, 16 Feb 2018 13:07:42 -0500 Subject: [PATCH 1/4] Search for just filename not name with %2F in it. --- src/WinRPM.jl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/WinRPM.jl b/src/WinRPM.jl index c6d4413..37f2e65 100644 --- a/src/WinRPM.jl +++ b/src/WinRPM.jl @@ -463,7 +463,13 @@ function do_install(package::Package) write(f, data[1]) end info("Extracting: ", name) - cpio = splitext(path2)[1]*".cpio" + + @static if VERSION < v"0.7.0-DEV" + cpio = splitext(path2)[1]*".cpio" + else + cpio = splitext(joinpath(cache, escape(last(split(path, "/")))))[1] * ".cpio" + end + local err = nothing for cmd = [`$exe7z x -y $path2 -o$cache`, `$exe7z x -y $cpio -o$installdir`] (out, pc) = open(cmd, "r") From fffb0bf7d5c4912a9947b12ce56a958405342103 Mon Sep 17 00:00:00 2001 From: Matthew Churilla Date: Fri, 16 Feb 2018 14:09:28 -0500 Subject: [PATCH 2/4] Target to specific version when 7zip changed 0.7.0-DEV.2181 --- src/WinRPM.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WinRPM.jl b/src/WinRPM.jl index 37f2e65..34a239e 100644 --- a/src/WinRPM.jl +++ b/src/WinRPM.jl @@ -464,7 +464,7 @@ function do_install(package::Package) end info("Extracting: ", name) - @static if VERSION < v"0.7.0-DEV" + @static if VERSION < v"0.7.0-DEV.2181" cpio = splitext(path2)[1]*".cpio" else cpio = splitext(joinpath(cache, escape(last(split(path, "/")))))[1] * ".cpio" From c60d65279b0306313cf1f0ce245bbb4fb1321183 Mon Sep 17 00:00:00 2001 From: Matthew Churilla Date: Fri, 16 Feb 2018 14:12:14 -0500 Subject: [PATCH 3/4] Remove static macro --- src/WinRPM.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WinRPM.jl b/src/WinRPM.jl index 34a239e..92d56d7 100644 --- a/src/WinRPM.jl +++ b/src/WinRPM.jl @@ -464,7 +464,7 @@ function do_install(package::Package) end info("Extracting: ", name) - @static if VERSION < v"0.7.0-DEV.2181" + if VERSION < v"0.7.0-DEV.2181" cpio = splitext(path2)[1]*".cpio" else cpio = splitext(joinpath(cache, escape(last(split(path, "/")))))[1] * ".cpio" From 98878bd50483e2f00fb2a8d8b13c4cd90e5fd980 Mon Sep 17 00:00:00 2001 From: Matthew Churilla Date: Fri, 16 Feb 2018 14:24:23 -0500 Subject: [PATCH 4/4] switch to basename --- src/WinRPM.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WinRPM.jl b/src/WinRPM.jl index 92d56d7..72434c9 100644 --- a/src/WinRPM.jl +++ b/src/WinRPM.jl @@ -467,7 +467,7 @@ function do_install(package::Package) if VERSION < v"0.7.0-DEV.2181" cpio = splitext(path2)[1]*".cpio" else - cpio = splitext(joinpath(cache, escape(last(split(path, "/")))))[1] * ".cpio" + cpio = splitext(joinpath(cache, escape(basename(path))))[1] * ".cpio" end local err = nothing