Skip to content

Commit

Permalink
use same env for shebang in scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
bishabosha committed May 19, 2022
1 parent 7e05e4e commit 37bcdb3
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 14 deletions.
3 changes: 1 addition & 2 deletions compiler/test-resources/scripting/argfileClasspath.sc
@@ -1,9 +1,8 @@
#!dist/target/pack/bin/scala @compiler/test-resources/scripting/cpArgumentsFile.txt
#!/usr/bin/env dist/target/pack/bin/scala @compiler/test-resources/scripting/cpArgumentsFile.txt

import java.nio.file.Paths

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

3 changes: 1 addition & 2 deletions compiler/test-resources/scripting/classpathReport.sc
@@ -1,4 +1,4 @@
#!bin/scala -classpath 'dist/target/pack/lib/*'
#!/usr/bin/env dist/target/pack/bin/scala -classpath 'dist/target/pack/lib/*'

import java.nio.file.Paths

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

extension(s: String)
def norm: String = s.replace('\\', '/')

2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/hashBang.sc
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala
# comment
STUFF=nada
!#
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/hashBang.scala
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala
# comment
STUFF=nada
!#
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/mainClassOnStack.sc
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala
export STUFF=nada
#lots of other stuff that isn't valid scala
!#
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/mainClassOnStack.scala
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala
export STUFF=nada
#lots of other stuff that isn't valid scala
!#
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/scriptName.scala
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala

def main(args: Array[String]): Unit =
val name = Option(sys.props("script.name")) match {
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/scriptPath.sc
@@ -1,4 +1,4 @@
#!dist/target/pack/bin/scala
#!/usr/bin/env dist/target/pack/bin/scala

def main(args: Array[String]): Unit =
args.zipWithIndex.foreach { case (arg,i) => printf("arg %d: [%s]\n",i,arg) }
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/showArgs.sc
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala

// precise output format expected by BashScriptsTests.scala
def main(args: Array[String]): Unit =
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/sqlDateError.sc
@@ -1,4 +1,4 @@
#!bin/scala -nosave
#!/usr/bin/env dist/target/pack/bin/scala -nosave

def main(args: Array[String]): Unit = {
println(new java.sql.Date(100L))
Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/touchFile.sc
@@ -1,4 +1,4 @@
#!/usr/bin/env scala
#!/usr/bin/env dist/target/pack/bin/scala

import java.io.File

Expand Down
2 changes: 1 addition & 1 deletion compiler/test-resources/scripting/unglobClasspath.sc
@@ -1,4 +1,4 @@
#!bin/scala -classpath 'dist/target/pack/lib/*'
#!/usr/bin/env dist/target/pack/bin/scala -classpath 'dist/target/pack/lib/*'

// won't compile unless the hashbang line sets classpath
import org.jline.terminal.Terminal
Expand Down
Empty file added touchedFile.out
Empty file.

0 comments on commit 37bcdb3

Please sign in to comment.