diff options
author | Toshiaki Asai <toshi.alternative@gmail.com> | 2017-10-08 21:38:44 +0900 |
---|---|---|
committer | Toshiaki Asai <toshi.alternative@gmail.com> | 2017-10-08 21:38:44 +0900 |
commit | 29c4ee07da2c0ca35f4da035dc18ce60382f4658 (patch) | |
tree | 35cfafd56c9953d74d24046899ff23f20d3dac7e /mikutter.rb | |
parent | 12b594569344159e4084a58695c2f58aff837adf (diff) | |
parent | 61271f5fa8ed6e44e009c00b407d485afa442ca3 (diff) | |
download | mikutter-29c4ee07da2c0ca35f4da035dc18ce60382f4658.tar.gz |
Merge branch 'master' into develop
Diffstat (limited to 'mikutter.rb')
-rwxr-xr-x | mikutter.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mikutter.rb b/mikutter.rb index 150ad22f..09da715f 100755 --- a/mikutter.rb +++ b/mikutter.rb @@ -11,10 +11,9 @@ This software is released under the MIT License. http://opensource.org/licenses/mit-license.php =end -mikutter_directory = File.expand_path(File.dirname(__FILE__)) module Mikutter; end -require File.expand_path(File.join(mikutter_directory, 'core/boot/option')) +require_relative 'core/boot/option' Mopt.parse exec_command: true if !ENV['DISABLE_BUNDLER_SETUP'] || ['', '0'].include?(ENV['DISABLE_BUNDLER_SETUP'].to_s) @@ -34,7 +33,7 @@ require 'webrick' require 'thread' require 'fileutils' -require File.expand_path(File.join(mikutter_directory, 'core/utils')) +require_relative 'core/utils' miquire :boot, 'check_config_permission', 'mainloop', 'delayer' miquire :core, 'service', 'environment' |