| 1 |
naota 14/03/22 08:29:28 |
| 2 |
|
| 3 |
Modified: mikutter |
| 4 |
Added: mikutter-0.2.2.1537-disable-bundler.patch |
| 5 |
Log: |
| 6 |
version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F8551514) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 net-misc/mikutter/files/mikutter |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mikutter/files/mikutter?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: mikutter |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/mikutter/files/mikutter,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- mikutter 27 Apr 2013 05:28:02 -0000 1.3 |
| 24 |
+++ mikutter 22 Mar 2014 08:29:28 -0000 1.4 |
| 25 |
@@ -2,5 +2,5 @@ |
| 26 |
|
| 27 |
EPREFIX=${0%/usr/bin/mikutter} |
| 28 |
|
| 29 |
-$EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* |
| 30 |
+DISABLE_BUNDLER_SETUP= $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch |
| 36 |
|
| 37 |
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 |
| 38 |
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 |
| 39 |
|
| 40 |
Index: mikutter-0.2.2.1537-disable-bundler.patch |
| 41 |
=================================================================== |
| 42 |
commit d2d55a4c463c43de4577b479b7717f7648005e5c |
| 43 |
Author: Toshiaki Asai <toshi.alternative@×××××.com> |
| 44 |
Date: Sat Mar 15 23:31:59 2014 +0900 |
| 45 |
|
| 46 |
環境変数 DISABLE_BUNDLER_SETUP を空にセットすることで、bundlerを読みに行く挙動を抑制できるようにした refs #645 |
| 47 |
|
| 48 |
diff --git a/mikutter.rb b/mikutter.rb |
| 49 |
index 3adcb90..695e2f5 100755 |
| 50 |
--- a/mikutter.rb |
| 51 |
+++ b/mikutter.rb |
| 52 |
@@ -13,12 +13,14 @@ You should have received a copy of the GNU General Public License along with thi |
| 53 |
=end |
| 54 |
mikutter_directory = File.expand_path(File.dirname(__FILE__)) |
| 55 |
|
| 56 |
-begin |
| 57 |
- ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) |
| 58 |
- require 'bundler/setup' |
| 59 |
-rescue LoadError, SystemExit |
| 60 |
- # bundlerがないか、依存関係の解決に失敗した場合 |
| 61 |
- # System の gem を使ってみる |
| 62 |
+unless ENV['DISABLE_BUNDLER_SETUP'] |
| 63 |
+ begin |
| 64 |
+ ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) |
| 65 |
+ require 'bundler/setup' |
| 66 |
+ rescue LoadError, SystemExit |
| 67 |
+ # bundlerがないか、依存関係の解決に失敗した場合 |
| 68 |
+ # System の gem を使ってみる |
| 69 |
+ end |
| 70 |
end |
| 71 |
|
| 72 |
Thread.abort_on_exception = true |
Archives