From f4caed8e5d84c8427bcf4acdd23b278830a92b17 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto <matsumoto@soutaro.com> Date: Sun, 8 May 2022 21:28:03 +0900 Subject: [PATCH 1/2] steep binstub --- bin/steep | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/steep b/bin/steep index dac5d6d10..a1a2810fa 100755 --- a/bin/steep +++ b/bin/steep @@ -1,7 +1,8 @@ -#!/bin/sh +#!/usr/bin/env bash -REPO_ROOT=$(cd $(dirname $0); pwd) -GEMFILE=${REPO_ROOT}/../steep/Gemfile +BINSTUB_DIR=$(cd $(dirname $0); pwd) +GEMFILE=$(readlink -f ${BINSTUB_DIR}/../steep/Gemfile) +ROOT_DIR=$(readlink -f ${BINSTUB_DIR}/..) STEEP="bundle exec --gemfile=${GEMFILE} steep" @@ -9,8 +10,8 @@ if type "rbenv" > /dev/null 2>&1; then STEEP="rbenv exec ${STEEP}" else if type "rvm" > /dev/null 2>&1; then - STEEP="rvm ${REPO_ROOT} do ${STEEP}" + STEEP="rvm ${ROOT_DIR} do ${STEEP}" fi fi -exec $STEEP $* +exec $STEEP $@ From c4496a32833f73ea10b5c7267b3def0d9680db66 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto <matsumoto@soutaro.com> Date: Sun, 8 May 2022 21:28:25 +0900 Subject: [PATCH 2/2] Delete `#flat_map` shim --- sig/polyfill.rbs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sig/polyfill.rbs b/sig/polyfill.rbs index 4024f165e..38ac18e0b 100644 --- a/sig/polyfill.rbs +++ b/sig/polyfill.rbs @@ -8,12 +8,6 @@ module Gem end end -module Enumerable[unchecked out Elem] - def flat_map: [U] () { (Elem) -> Array[U] } -> Array[U] - | [U] () { (Elem) -> U } -> Array[U] - | ... -end - module Bundler class LockfileParser def initialize: (String) -> void