doc/news.texi | 7 +++++++ main.go | 9 ++++++++- t/goredo-rel-ifcreate.t | 29 +++++++++++++++++++++++++++++ usage.go | 2 +- diff --git a/doc/news.texi b/doc/news.texi index e10a50b536f3a21e5a09aff368aa4fc24852c10fe34fd87da35964c228709f01..e5c2ec8e4e315ff592c87bd38b31efa6083569f0dfadb22e68f54370e877892f 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -1,6 +1,13 @@ @node News @unnumbered News +@anchor{Release 1_14_0} +@section Release 1.14.0 +@itemize +@item + Fixed @command{redo-ifcreate}'s targets proper relative paths to the target. +@end itemize + @anchor{Release 1_13_0} @section Release 1.13.0 @itemize diff --git a/main.go b/main.go index 090743e87e3b2d7eac926ccf7846b89d34d60dbfcac724da88be8fbbc978a94f..9db16649b67d9c2c2b8e8c04e895973fa2a7b0a17700ffe8bb1cdbfd262ce17e 100644 --- a/main.go +++ b/main.go @@ -308,7 +308,14 @@ if fdDep == nil { log.Fatalln("no", EnvDepFd) } for _, tgt := range tgts { - err = ifcreate(fdDep, tgt) + tgtRel, err := filepath.Rel( + filepath.Join(Cwd, DirPrefix), + filepath.Join(Cwd, tgt), + ) + if err != nil { + break + } + err = ifcreate(fdDep, tgtRel) if err != nil { break } diff --git a/t/goredo-rel-ifcreate.t b/t/goredo-rel-ifcreate.t new file mode 100755 index 0000000000000000000000000000000000000000..379788c1d87f5c36b73bae96f8cfb6a6a8ce8265593353f6fc58f9a49855456e --- /dev/null +++ b/t/goredo-rel-ifcreate.t @@ -0,0 +1,29 @@ +#!/bin/sh + +testname=`basename "$0"` +test_description="Proper relative to DirPrefix ifcreate paths" +. $SHARNESS_TEST_SRCDIR/sharness.sh +export REDO_TOP_DIR="`pwd`" REDO_NO_PROGRESS=1 + +mkdir -p a/b/c a/c +echo whatever > a/b/c/dep +cat > a/b/default.do <