From f7f6c3edfe4fbe9d6dfa63791c2651ec2db9f99c Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 25 Jul 2019 10:15:32 -0700 Subject: [PATCH] Use '_' instead of '$' in path names The use of '$' in the path names for streams is a pain because, since '$' is a special character in the shell, it makes it impossible to directly copy and paste the paths. If we make this change, some builds will be left with vestigial directories with $global and $build in them until they run clean. It also would break any scripts that manually delete these paths. That doesn't seem like a common use case, but it's worth mentioning. --- main/src/main/scala/sbt/internal/BuildStructure.scala | 4 ++-- .../$global => _global/_global}/definedTestNames/data | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename sbt/src/server-test/completions/target/streams/test/{$global/$global => _global/_global}/definedTestNames/data (100%) diff --git a/main/src/main/scala/sbt/internal/BuildStructure.scala b/main/src/main/scala/sbt/internal/BuildStructure.scala index e8255c794..3ac97d14d 100644 --- a/main/src/main/scala/sbt/internal/BuildStructure.scala +++ b/main/src/main/scala/sbt/internal/BuildStructure.scala @@ -288,8 +288,8 @@ final class PartBuildUnit( object BuildStreams { type Streams = sbt.std.Streams[ScopedKey[_]] - final val GlobalPath = "$global" - final val BuildUnitPath = "$build" + final val GlobalPath = "_global" + final val BuildUnitPath = "_build" final val StreamsDirectory = "streams" def mkStreams( diff --git a/sbt/src/server-test/completions/target/streams/test/$global/$global/definedTestNames/data b/sbt/src/server-test/completions/target/streams/test/_global/_global/definedTestNames/data similarity index 100% rename from sbt/src/server-test/completions/target/streams/test/$global/$global/definedTestNames/data rename to sbt/src/server-test/completions/target/streams/test/_global/_global/definedTestNames/data