From 2b7da63c669216b53cc4d950c33dd38f0068377d Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Mon, 10 Dec 2018 04:33:57 +0000 Subject: [PATCH] Fix a few lagging doc references to old-style build+test layout. --- do | 4 +++- docs/GettingStarted.md | 4 ++-- test.do | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/do b/do index 856218f..7d947ce 100755 --- a/do +++ b/do @@ -66,11 +66,13 @@ case $target in build && bin/redo $args "$target" ;; test) - # Test both redo and minimal/do + # First test minimal/do build + # Add ./redo to PATH so we launch with redo/sh as the shell PATH=$PWD/redo:$PATH minimal/do test || die "minimal/do test failed" clean build + # Now switch to testing 'real' redo bin/redo $args test || die "redo test failed" ;; clean) diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index b7eb954..c860199 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -19,10 +19,10 @@ You can run redo without installing it, like this: ```sh git clone https://github.com/apenwarr/redo cd redo - ./redo -j10 test + ./do -j10 test ``` -If the tests pass, you can either add $PWD/redo to your PATH, or install +If the tests pass, you can either add $PWD/redo/bin to your PATH, or install redo on your system. To install for all users, put it in /usr/local: ```sh diff --git a/test.do b/test.do index 0049135..0d02c15 100644 --- a/test.do +++ b/test.do @@ -1,3 +1,2 @@ redo-ifchange bin/all redo minimal/test docs/test t/all _all -[ -n "$DO_BUILT" ] || echo "Don't forget to test 'minimal/do -c test'" >&2