Remove this hack; Fixes #282

I think we should stop recommending `tea` as a shebang line, it's against our spirit. Instead tea tools should shim via `tea` before exec’ing to do any of the YAML frontmatter
This commit is contained in:
Max Howell 2023-01-03 09:32:07 -05:00
parent fc31bb8939
commit b135e63527
Failed to extract signature
3 changed files with 2 additions and 24 deletions

View file

@ -18,9 +18,7 @@ build:
gnu.org/gettext: ^0.21 gnu.org/gettext: ^0.21
tea.xyz/gx/cc: c99 tea.xyz/gx/cc: c99
tea.xyz/gx/make: '*' tea.xyz/gx/make: '*'
git-scm.org: 2
script: | script: |
git apply props/tolerant-shebang.diff
./configure --prefix="{{prefix}}" --enable-load-relative ./configure --prefix="{{prefix}}" --enable-load-relative
make --jobs {{hw.concurrency}} install make --jobs {{hw.concurrency}} install

View file

@ -1,22 +0,0 @@
diff --git a/ruby.c b/ruby.c
index d7ba181..e2a80df 100644
--- a/ruby.c
+++ b/ruby.c
@@ -2281,7 +2281,7 @@ load_file_internal(VALUE argp_v)
RSTRING_GETMEM(line, str, len);
if (len > 2 && str[0] == '#' && str[1] == '!') {
if (line_start == 1) warn_cr_in_shebang(str, len);
- if ((p = strstr(str+2, ruby_engine)) != 0) {
+ if ((p = strstr(str+2, ruby_engine)) != 0 && !getenv("TEA_PREFIX")) {
goto start_read;
}
}
@@ -2295,7 +2295,7 @@ load_file_internal(VALUE argp_v)
if (c == INT2FIX('!') && !NIL_P(line = rb_io_gets(f))) {
RSTRING_GETMEM(line, str, len);
warn_cr_in_shebang(str, len);
- if ((p = strstr(str, ruby_engine)) == 0) {
+ if ((p = strstr(str, ruby_engine)) == 0 && !getenv("TEA_PREFIX")) {
/* not ruby script, assume -x flag */
goto search_shebang;
}

View file

@ -16,6 +16,8 @@ test:
script: | script: |
gem install awesome_print gem install awesome_print
ruby -e 'require "awesome_print"' -e 'ap $LOAD_PATH' ruby -e 'require "awesome_print"' -e 'ap $LOAD_PATH'
gem install hexapdf
hexapdf version
provides: provides:
- bin/bundle - bin/bundle