Skip to content

Commit 0181ef9

Browse files
authored
Merge pull request #15259 from lampepfl/revert-15241-fix-shebang-macos
2 parents 2704324 + bcc3c07 commit 0181ef9

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

compiler/test-resources/scripting/classpathReport.sc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*'
1+
#!bin/scala -classpath 'dist/target/pack/lib/*'
22

33
import java.nio.file.Paths
44

@@ -9,3 +9,4 @@ def main(args: Array[String]): Unit =
99

1010
extension(s: String)
1111
def norm: String = s.replace('\\', '/')
12+

compiler/test-resources/scripting/scriptPath.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env dist/target/pack/bin/scala
1+
#!dist/target/pack/bin/scala
22

33
def main(args: Array[String]): Unit =
44
args.zipWithIndex.foreach { case (arg,i) => printf("arg %d: [%s]\n",i,arg) }

compiler/test-resources/scripting/sqlDateError.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S bin/scala
1+
#!bin/scala
22

33
def main(args: Array[String]): Unit = {
44
println(new java.sql.Date(100L))

compiler/test-resources/scripting/unglobClasspath.sc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*'
1+
#!bin/scala -classpath 'dist/target/pack/lib/*'
22

33
// won't compile unless the hashbang line sets classpath
4-
import org.jsoup.Jsoup
4+
import org.jline.terminal.Terminal
55

66
def main(args: Array[String]) =
77
val cp = sys.props("java.class.path")

0 commit comments

Comments
 (0)