naota 14/03/22 08:29:28 Modified: mikutter Added: mikutter-0.2.2.1537-disable-bundler.patch Log: version bump (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Revision Changes Path 1.4 net-misc/mikutter/files/mikutter file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?r1=1.3&r2=1.4 Index: mikutter =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/mikutter/files/mikutter,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mikutter 27 Apr 2013 05:28:02 -0000 1.3 +++ mikutter 22 Mar 2014 08:29:28 -0000 1.4 @@ -2,5 +2,5 @@ EPREFIX=${0%/usr/bin/mikutter} -$EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* +DISABLE_BUNDLER_SETUP= $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* 1.1 net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch?rev=1.1&content-type=text/plain Index: mikutter-0.2.2.1537-disable-bundler.patch =================================================================== commit d2d55a4c463c43de4577b479b7717f7648005e5c Author: Toshiaki Asai <toshi.alternat...@gmail.com> Date: Sat Mar 15 23:31:59 2014 +0900 環境変数 DISABLE_BUNDLER_SETUP を空にセットすることで、bundlerを読みに行く挙動を抑制できるようにした refs #645 diff --git a/mikutter.rb b/mikutter.rb index 3adcb90..695e2f5 100755 --- a/mikutter.rb +++ b/mikutter.rb @@ -13,12 +13,14 @@ You should have received a copy of the GNU General Public License along with thi =end mikutter_directory = File.expand_path(File.dirname(__FILE__)) -begin - ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) - require 'bundler/setup' -rescue LoadError, SystemExit - # bundlerがないか、依存関係の解決に失敗した場合 - # System の gem を使ってみる +unless ENV['DISABLE_BUNDLER_SETUP'] + begin + ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) + require 'bundler/setup' + rescue LoadError, SystemExit + # bundlerがないか、依存関係の解決に失敗した場合 + # System の gem を使ってみる + end end Thread.abort_on_exception = true
