Merge 432531f into c9eb88e

ManageIQ · Aug 21, 2018 · 436c83c · 436c83c
2 parents c9eb88e + 432531f
commit 436c83c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,6 @@ matrix:
 addons:
   postgresql: '9.5'
 before_install:
-- mkdir ${TRAVIS_BUILD_DIR}/log
 - source ${TRAVIS_BUILD_DIR}/tools/ci/before_install.sh
 before_script:
 - bundle exec rake test:$TEST_SUITE:setup

diff --git a/bin/setup b/bin/setup
@@ -16,7 +16,6 @@ end
 
 Dir.chdir(ManageIQ::Environment::APP_ROOT) do
   ManageIQ::Environment.ensure_config_files
-  Dir.mkdir("log") unless File.exist?("log")
 
   puts '== Installing dependencies =='
   ManageIQ::Environment.install_bundler

diff --git a/lib/manageiq/environment.rb b/lib/manageiq/environment.rb
@@ -39,6 +39,9 @@ def self.ensure_config_files
         puts "Copying #{file} from template..."
         FileUtils.cp(APP_ROOT.join(source), file)
       end
+
+      logdir = APP_ROOT.join("log")
+      Dir.mkdir(logdir) unless Dir.exist?(logdir)
     end
 
     def self.while_updating_bower