From e91f32f2b58eda31fa8d8206ce9d0a8aef52ad13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 31 Jan 2020 14:06:26 +0100 Subject: [PATCH] Use light box drawing symbols --- src/libutil/util.hh | 6 +++--- src/nix/why-depends.cc | 2 +- tests/dependencies.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 5d44b92c3..320590836 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -459,9 +459,9 @@ void ignoreException(); /* Tree formatting. */ -constexpr char treeConn[] = "╠═══"; -constexpr char treeLast[] = "╚═══"; -constexpr char treeLine[] = "║ "; +constexpr char treeConn[] = "├───"; +constexpr char treeLast[] = "└───"; +constexpr char treeLine[] = "│ "; constexpr char treeNull[] = " "; diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc index fb12d5380..900466538 100644 --- a/src/nix/why-depends.cc +++ b/src/nix/why-depends.cc @@ -152,7 +152,7 @@ struct CmdWhyDepends : SourceExprCommand std::cout << fmt("%s%s%s%s" ANSI_NORMAL "\n", firstPad, node.visited ? "\e[38;5;244m" : "", - firstPad != "" ? "=> " : "", + firstPad != "" ? "→ " : "", pathS); if (node.path == dependencyPath && !all diff --git a/tests/dependencies.sh b/tests/dependencies.sh index 93b681f18..4be241482 100644 --- a/tests/dependencies.sh +++ b/tests/dependencies.sh @@ -6,7 +6,7 @@ drvPath=$(nix-instantiate dependencies.nix) echo "derivation is $drvPath" -nix-store -q --tree "$drvPath" | grep '║ ╚═══.*builder1.sh' +nix-store -q --tree "$drvPath" | grep '│ └───.*builder1.sh' # Test Graphviz graph generation. nix-store -q --graph "$drvPath" > $TEST_ROOT/graph @@ -24,7 +24,7 @@ if test -n "$dot"; then $dot < $TEST_ROOT/graph fi -nix-store -q --tree "$outPath" | grep '═══.*dependencies-input-2' +nix-store -q --tree "$outPath" | grep '───.*dependencies-input-2' echo "output path is $outPath"