From 5cd182ff8f3d90a44aa2d846cc6fb75a423e2445 Mon Sep 17 00:00:00 2001
From: Thomas Levine <_@thomaslevine.com>
Date: Sun, 6 Mar 2016 14:38:56 +0000
Subject: [PATCH] look for .urchin_root rather than .urchin

---
 tests/{.urchin => .urchin_root}                                 | 0
 .../.test-TEST_SHELL-passed-through/{.urchin => .urchin_root}   | 0
 .../{.urchin => .urchin_root}                                   | 0
 .../.test-run-by-specified-shell/{.urchin => .urchin_root}      | 0
 tests/Errors/.test/{.urchin => .urchin_root}                    | 0
 tests/Flags/.test_-e,--exit-on-fail/{.urchin => .urchin_root}   | 0
 tests/Flags/.testsuite/{.urchin => .urchin_root}                | 0
 tests/Molly guard/.chainsaw/{.urchin => .urchin_root}           | 0
 tests/Setup and Teardown/.test/{.urchin => .urchin_root}        | 0
 urchin                                                          | 2 +-
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/{.urchin => .urchin_root} (100%)
 rename tests/Cross-shell testing/.test-TEST_SHELL-passed-through/{.urchin => .urchin_root} (100%)
 rename tests/Cross-shell testing/.test-TEST_SHELL-undefined_or_empty/{.urchin => .urchin_root} (100%)
 rename tests/Cross-shell testing/.test-run-by-specified-shell/{.urchin => .urchin_root} (100%)
 rename tests/Errors/.test/{.urchin => .urchin_root} (100%)
 rename tests/Flags/.test_-e,--exit-on-fail/{.urchin => .urchin_root} (100%)
 rename tests/Flags/.testsuite/{.urchin => .urchin_root} (100%)
 rename tests/Molly guard/.chainsaw/{.urchin => .urchin_root} (100%)
 rename tests/Setup and Teardown/.test/{.urchin => .urchin_root} (100%)

diff --git a/tests/.urchin b/tests/.urchin_root
similarity index 100%
rename from tests/.urchin
rename to tests/.urchin_root
diff --git a/tests/Cross-shell testing/.test-TEST_SHELL-passed-through/.urchin b/tests/Cross-shell testing/.test-TEST_SHELL-passed-through/.urchin_root
similarity index 100%
rename from tests/Cross-shell testing/.test-TEST_SHELL-passed-through/.urchin
rename to tests/Cross-shell testing/.test-TEST_SHELL-passed-through/.urchin_root
diff --git a/tests/Cross-shell testing/.test-TEST_SHELL-undefined_or_empty/.urchin b/tests/Cross-shell testing/.test-TEST_SHELL-undefined_or_empty/.urchin_root
similarity index 100%
rename from tests/Cross-shell testing/.test-TEST_SHELL-undefined_or_empty/.urchin
rename to tests/Cross-shell testing/.test-TEST_SHELL-undefined_or_empty/.urchin_root
diff --git a/tests/Cross-shell testing/.test-run-by-specified-shell/.urchin b/tests/Cross-shell testing/.test-run-by-specified-shell/.urchin_root
similarity index 100%
rename from tests/Cross-shell testing/.test-run-by-specified-shell/.urchin
rename to tests/Cross-shell testing/.test-run-by-specified-shell/.urchin_root
diff --git a/tests/Errors/.test/.urchin b/tests/Errors/.test/.urchin_root
similarity index 100%
rename from tests/Errors/.test/.urchin
rename to tests/Errors/.test/.urchin_root
diff --git a/tests/Flags/.test_-e,--exit-on-fail/.urchin b/tests/Flags/.test_-e,--exit-on-fail/.urchin_root
similarity index 100%
rename from tests/Flags/.test_-e,--exit-on-fail/.urchin
rename to tests/Flags/.test_-e,--exit-on-fail/.urchin_root
diff --git a/tests/Flags/.testsuite/.urchin b/tests/Flags/.testsuite/.urchin_root
similarity index 100%
rename from tests/Flags/.testsuite/.urchin
rename to tests/Flags/.testsuite/.urchin_root
diff --git a/tests/Molly guard/.chainsaw/.urchin b/tests/Molly guard/.chainsaw/.urchin_root
similarity index 100%
rename from tests/Molly guard/.chainsaw/.urchin
rename to tests/Molly guard/.chainsaw/.urchin_root
diff --git a/tests/Setup and Teardown/.test/.urchin b/tests/Setup and Teardown/.test/.urchin_root
similarity index 100%
rename from tests/Setup and Teardown/.test/.urchin
rename to tests/Setup and Teardown/.test/.urchin_root
diff --git a/urchin b/urchin
index 5e59e92..0170ca1 100755
--- a/urchin
+++ b/urchin
@@ -136,7 +136,7 @@ urchin_root() {
     return 1
   elif test -f "${current}"; then
     urchin_root "$(dirname -- "${current}")" "${orig}"
-  elif test -f "${current}"/.urchin; then
+  elif test -f "${current}"/.urchin_root; then
     remove_trailing_slash "${current}"
   else
     urchin_root "${current}"/.. "${orig}"