From 234aca6369458a4631e083da694e15f40339849d Mon Sep 17 00:00:00 2001 From: Julien Sagot Date: Fri, 30 May 2014 22:44:17 +0200 Subject: [PATCH] mkdir_p fixed: current directory is the same before and after function call Updated makorel version number to 0.2.1. --- makorel.ml | 4 ++-- unixx.ml | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/makorel.ml b/makorel.ml index 5ecf3b7..f987476 100644 --- a/makorel.ml +++ b/makorel.ml @@ -74,7 +74,7 @@ let init root_dir version = Pervasives.close_out out in let dir = root_dir ^ "/" ^ package_name ^ "." ^ version in mkdir_p dir; - write_file (dir ^ "/descr") "No description yet.\n"; + write_file (dir ^ "/descr") (package_name ^ " - No description yet.\n"); write_file (dir ^ "/opam") opam_items; write_file (dir ^ "/url") url_items @@ -148,7 +148,7 @@ let upgrade root_dir new_ver = (* main function *) let _ = - let makorel_version = "0.2.0" in + let makorel_version = "0.2.1" in let create = ref false in let version = ref "" in diff --git a/unixx.ml b/unixx.ml index 4523854..d75ce11 100644 --- a/unixx.ml +++ b/unixx.ml @@ -53,6 +53,7 @@ let mkdir_p path = (* FIXME: absolute are parsed as relatives (first / is removed by splitting) *) (* FIXME: "my\/bad\/path/" will be splitted as ["my"; "bad"; "path"] * instead of ["my\/bad\/path"]*) + let initial_dir = Sys.getcwd () in path |> Str.split (Str.regexp "/") |> List.iter @@ -63,4 +64,5 @@ let mkdir_p path = else if not (Sys.is_directory dst) then failwith (dst ^ " already exists and is a file"); Sys.chdir dst - end + end; + Sys.chdir initial_dir