From 3069e8e21dbbbf841b2d15d223ab716b2d8a8db1 Mon Sep 17 00:00:00 2001 From: ahiru Date: Wed, 1 Feb 2017 15:48:56 +0900 Subject: [PATCH] check command-line args before running bundler setup Signed-off-by: ahiru --- mikutter.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mikutter.rb b/mikutter.rb index 28e78457..0997cc1a 100755 --- a/mikutter.rb +++ b/mikutter.rb @@ -13,6 +13,9 @@ http://opensource.org/licenses/mit-license.php =end mikutter_directory = File.expand_path(File.dirname(__FILE__)) +require File.expand_path(File.join(mikutter_directory, 'core/boot/option')) +Mopt.parse exec_command: true + if !ENV['DISABLE_BUNDLER_SETUP'] || ['', '0'].include?(ENV['DISABLE_BUNDLER_SETUP'].to_s) begin ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) @@ -30,8 +33,6 @@ require 'webrick' require 'thread' require 'fileutils' -require File.expand_path(File.join(mikutter_directory, 'core/boot/option')) -Mopt.parse exec_command: true require File.expand_path(File.join(mikutter_directory, 'core/utils')) miquire :boot, 'check_config_permission', 'mainloop', 'delayer' -- 2.11.0