diff options
-rwxr-xr-x | build.sc | 14 | ||||
-rwxr-xr-x | mill | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -522,11 +522,7 @@ object dev extends MillModule{ if (isWin) { windowsVmOptions("dev.launcher", outputPath, forkArgs()) } else { - val perms = java.nio.file.Files.getPosixFilePermissions(outputPath.toNIO) - perms.add(PosixFilePermission.GROUP_EXECUTE) - perms.add(PosixFilePermission.OWNER_EXECUTE) - perms.add(PosixFilePermission.OTHERS_EXECUTE) - java.nio.file.Files.setPosixFilePermissions(outputPath.toNIO, perms) + os.perms.set(outputPath, "rwxrwxrwx") } PathRef(outputPath) } @@ -608,16 +604,18 @@ def assembly = T{ def millBootstrap = T.sources(os.pwd / "mill") def launcher = T{ - val millBootstrapGrepPrefix = "DEFAULT_MILL_VERSION=" + val outputPath = T.ctx().dest / "mill" + val millBootstrapGrepPrefix = "\nDEFAULT_MILL_VERSION=" os.write( - T.ctx().dest / "mill", + outputPath, os.read(millBootstrap().head.path) .replaceAll( millBootstrapGrepPrefix + "[^\\n]+", millBootstrapGrepPrefix + publishVersion()._2 ) ) - PathRef(T.ctx().dest / "mill") + os.perms.set(outputPath, "rwxrwxrwx") + PathRef(outputPath) } val isMasterCommit = { @@ -10,6 +10,8 @@ set -e if [ -z "$MILL_VERSION" ] ; then if [ -f ".mill-version" ] ; then MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)" + elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then + MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | cut -d= -f2) else MILL_VERSION=$DEFAULT_MILL_VERSION fi |