Minor tweaks on idris repl rules

BryghtWords · Nov 26, 2018 · 18f0a9a · 18f0a9a
1 parent 0815253
commit 18f0a9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/idris/idris_repos.bzl b/idris/idris_repos.bzl
@@ -2,7 +2,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 def loadIdrisPackagerRepositories():
-  rules_scala_version="b537bddc58a77318b34165812a0311ef52806318"
+  rules_scala_version="4be50865a332aef46c46c94b345c320c3353e9e1"
   http_archive(
     name = "io_bazel_rules_scala",
     url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip"%rules_scala_version,

diff --git a/idris/rules_idris.bzl b/idris/rules_idris.bzl
@@ -22,10 +22,12 @@ def _idris_console_impl(ctx):
     script = """
 #!/bin/bash
 
+cd "$BUILD_WORKING_DIRECTORY"
+
 DIR="${{BASH_SOURCE[0]}}.runfiles/idris"
 
 HOME=`pwd` \
-$DIR/{idrisPackager} idris $DIR/{idris} {args}
+$DIR/{idrisPackager} idris $DIR/{idris} {args} "$@"
     """.format(
       idrisPackager = ctx.executable._idris_packager.short_path,
       idris = ctx.executable._idris.short_path,
@@ -57,7 +59,7 @@ idris_console_rule = rule(
         default = Label("@idris_packager//ip:idrisPackager"),),
    "_tools": attr.label_list(
        allow_files = True,
-       default = ["@idris_packager//ip:idrisPackager", "@idris//:bin/idris"],), # Label("@idris_packager//ip:idrisPackager.runfiles"),),
+       default = ["@idris_packager//ip:idrisPackager", "@idris//:bin/idris"],),
   },
   executable = True,
 )