From 07814bc576533cf725bcf81b0e7aa7a6b21eee4f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 23 Sep 2019 18:08:29 -0400 Subject: [PATCH 1/2] Fix _to_be_replaced --- build.sbt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 267ebf00a..9a112b86f 100644 --- a/build.sbt +++ b/build.sbt @@ -172,8 +172,15 @@ val root = (project in file(".")). mappings in Universal := { val t = (target in Universal).value val prev = (mappings in Universal).value - val BinBat = "bin" + java.io.File.separator + "sbt.bat" + val BinSbt = "bin" + java.io.File.separator + "sbt" + val BinBat = BinSbt + ".bat" prev.toList map { + case (k, BinSbt) => + val x = IO.read(k) + IO.write(t / "sbt", x.replaceAllLiterally( + "declare init_sbt_version=_to_be_replaced", + s"""declare init_sbt_version=$sbtVersionToRelease""")) + (t / "sbt", BinSbt) case (k, BinBat) => val x = IO.read(k) IO.write(t / "sbt.bat", x.replaceAllLiterally( From f06e7e638e41a5a8e69735fdeb7dcd9d58c56a21 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 24 Sep 2019 12:31:18 -0400 Subject: [PATCH 2/2] Set posix +x Co-Authored-By: Eric Peters --- build.sbt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.sbt b/build.sbt index 9a112b86f..a7d801219 100644 --- a/build.sbt +++ b/build.sbt @@ -176,10 +176,18 @@ val root = (project in file(".")). val BinBat = BinSbt + ".bat" prev.toList map { case (k, BinSbt) => + import java.nio.file.{Files, FileSystems} + val x = IO.read(k) IO.write(t / "sbt", x.replaceAllLiterally( "declare init_sbt_version=_to_be_replaced", s"""declare init_sbt_version=$sbtVersionToRelease""")) + + if (FileSystems.getDefault.supportedFileAttributeViews.contains("posix")) { + val perms = Files.getPosixFilePermissions(k.toPath) + Files.setPosixFilePermissions(t / "sbt" toPath, perms) + } + (t / "sbt", BinSbt) case (k, BinBat) => val x = IO.read(k)