Navigation Menu

Skip to content

Commit

Permalink
Show default base dir
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Jun 27, 2014
1 parent 33b2d6f commit 473c07a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions bin/droonga-engine-join
Expand Up @@ -28,6 +28,7 @@ require "droonga/data_absorber"
require "droonga/serf"

options = OpenStruct.new
options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd
options.dataset = "Default"
options.port = 10031
options.tag = "droonga"
Expand All @@ -38,7 +39,8 @@ parser = OptionParser.new
parser.version = Droonga::Engine::VERSION

parser.on("--base-dir=PATH",
"Path to the base directory the catalog.json is located in.") do |path|
"Path to the base directory the catalog.json is located in.",
"(#{options.base_dir})") do |path|
options.base_dir = path
end

Expand Down Expand Up @@ -67,8 +69,7 @@ end
parser.parse!(ARGV)


base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd
base_dir = Pathname(base_dir).expand_path
base_dir = Pathname(options.base_dir).expand_path
ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s

catalog_path = Droonga::Path.base + "catalog.json"
Expand Down
7 changes: 4 additions & 3 deletions bin/droonga-engine-unjoin
Expand Up @@ -28,6 +28,7 @@ require "droonga/data_absorber"
require "droonga/serf"

options = OpenStruct.new
options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd
options.dataset = "Default"
options.port = 10031
options.tag = "droonga"
Expand All @@ -37,7 +38,8 @@ parser = OptionParser.new
parser.version = Droonga::Engine::VERSION

parser.on("--base-dir=PATH",
"Path to the base directory the catalog.json is located in.") do |path|
"Path to the base directory the catalog.json is located in.",
"(#{options.base_dir})") do |path|
options.base_dir = path
end

Expand All @@ -51,8 +53,7 @@ end
parser.parse!(ARGV)


base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd
base_dir = Pathname(base_dir).expand_path
base_dir = Pathname(options.base_dir).expand_path
ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s

catalog_path = Droonga::Path.base + "catalog.json"
Expand Down

0 comments on commit 473c07a

Please sign in to comment.