From b135e63527dfe0129ce2f29ff0e54d7abb839611 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Tue, 3 Jan 2023 09:32:07 -0500 Subject: [PATCH] Remove this hack; Fixes #282 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- projects/ruby-lang.org/package.yml | 2 -- projects/ruby-lang.org/tolerant-shebang.diff | 22 -------------------- projects/rubygems.org/package.yml | 2 ++ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 projects/ruby-lang.org/tolerant-shebang.diff diff --git a/projects/ruby-lang.org/package.yml b/projects/ruby-lang.org/package.yml index efc8126a..ae1c26bb 100644 --- a/projects/ruby-lang.org/package.yml +++ b/projects/ruby-lang.org/package.yml @@ -18,9 +18,7 @@ build: gnu.org/gettext: ^0.21 tea.xyz/gx/cc: c99 tea.xyz/gx/make: '*' - git-scm.org: 2 script: | - git apply props/tolerant-shebang.diff ./configure --prefix="{{prefix}}" --enable-load-relative make --jobs {{hw.concurrency}} install diff --git a/projects/ruby-lang.org/tolerant-shebang.diff b/projects/ruby-lang.org/tolerant-shebang.diff deleted file mode 100644 index a5b446be..00000000 --- a/projects/ruby-lang.org/tolerant-shebang.diff +++ /dev/null @@ -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; - } diff --git a/projects/rubygems.org/package.yml b/projects/rubygems.org/package.yml index ab29d093..e7be814d 100644 --- a/projects/rubygems.org/package.yml +++ b/projects/rubygems.org/package.yml @@ -16,6 +16,8 @@ test: script: | gem install awesome_print ruby -e 'require "awesome_print"' -e 'ap $LOAD_PATH' + gem install hexapdf + hexapdf version provides: - bin/bundle