Skip to content

Commit 3b1413b

Browse files
committed
use same env for shebang in scripts
1 parent 7e05e4e commit 3b1413b

12 files changed

+12
-14
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#!dist/target/pack/bin/scala @compiler/test-resources/scripting/cpArgumentsFile.txt
1+
#!/usr/bin/env dist/target/pack/bin/scala @compiler/test-resources/scripting/cpArgumentsFile.txt
22

33
import java.nio.file.Paths
44

55
def main(args: Array[String]): Unit =
66
val cwd = Paths.get(".").toAbsolutePath.toString.replace('\\', '/').replaceAll("/$", "")
77
printf("cwd: %s\n", cwd)
88
printf("classpath: %s\n", sys.props("java.class.path"))
9-

compiler/test-resources/scripting/classpathReport.sc

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

33
import java.nio.file.Paths
44

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

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

compiler/test-resources/scripting/hashBang.sc

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

compiler/test-resources/scripting/hashBang.scala

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

compiler/test-resources/scripting/mainClassOnStack.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env scala
1+
#!/usr/bin/env dist/target/pack/bin/scala
22
export STUFF=nada
33
#lots of other stuff that isn't valid scala
44
!#

compiler/test-resources/scripting/mainClassOnStack.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env scala
1+
#!/usr/bin/env dist/target/pack/bin/scala
22
export STUFF=nada
33
#lots of other stuff that isn't valid scala
44
!#

compiler/test-resources/scripting/scriptName.scala

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

33
def main(args: Array[String]): Unit =
44
val name = Option(sys.props("script.name")) match {

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-
#!dist/target/pack/bin/scala
1+
#!/usr/bin/env 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/showArgs.sc

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

33
// precise output format expected by BashScriptsTests.scala
44
def main(args: Array[String]): Unit =

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-
#!bin/scala -nosave
1+
#!/usr/bin/env dist/target/pack/bin/scala -nosave
22

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

compiler/test-resources/scripting/touchFile.sc

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

33
import java.io.File
44

compiler/test-resources/scripting/unglobClasspath.sc

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

33
// won't compile unless the hashbang line sets classpath
44
import org.jline.terminal.Terminal

0 commit comments

Comments
 (0)