Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix unzip command and properly clean up temp files #9

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix unzip command and properly clean up temp files #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix unzip command and properly clean up temp files 
If unzip is compiled with -DWILD_STOP_AT_DIR, the * wildcard does not
match the dir separator, so subdirectories are not extracted.
  • Loading branch information
@vqns
vqns committed Oct 5, 2024
commit ac2a237ebc68222cb9dc42903bf52e42a94b837c
13 changes: 9 additions & 4 deletions src/util/zip.sml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ fun fromFile (s:string) : t =
{zipfile=s,deleted=ref false}

fun download (url:string) : t =
let val localzip = OS.FileSys.tmpName() ^ ".zip"
let val localzip = OS.FileSys.tmpName()
val (status,out,err) = System.command ("curl -L -o " ^ localzip ^ " " ^ url)
in if OS.Process.isSuccess status then
{zipfile=localzip,deleted=ref false}
@@ -37,7 +37,7 @@ fun extractSubDir {log: string -> unit} ({zipfile,deleted}:t) {path:string,targe
val () = System.createDirectoryIfMissing true target
fun cmds zipfile path target : {zipcmd:string,mvcmd:string,tmpdir:string} =
let val tmpdir = target ^ "_tmp~"
in {zipcmd = "unzip " ^ zipfile ^ " '" ^ path ^ "/*' -d " ^ tmpdir,
in {zipcmd = "unzip " ^ zipfile ^ " '" ^ path ^ "/**' -d " ^ tmpdir,
mvcmd = "mv " ^ tmpdir ^ "/" ^ path ^ "/* " ^ target ^ "/",
tmpdir = tmpdir}
end
@@ -49,16 +49,21 @@ fun extractSubDir {log: string -> unit} ({zipfile,deleted}:t) {path:string,targe

val () = log ("cmd: " ^ zipcmd)
val (status,out,err) = System.command zipcmd

val () = log ("removing " ^ zipfile)
val () = System.removePathForcibly zipfile

val () = if OS.Process.isSuccess status then ()
else raise Fail ("failed to extract " ^ zipfile ^ ": " ^ err)

val () = log ("cmd: " ^ mvcmd)
val (status,out,err) = System.command mvcmd
val () = if OS.Process.isSuccess status then ()
else raise Fail ("failed to move tmpdir into target: " ^ err)

val () = log ("removing " ^ tmpdir)
val () = System.removePathForcibly tmpdir

val () = if OS.Process.isSuccess status then ()
else raise Fail ("failed to move tmpdir into target: " ^ err)
in ()
end

Loading