From 6abc6137fb199b2b1d6ab6e77a26b2cfc1ab90e4 Mon Sep 17 00:00:00 2001
From: Satoe Imaishi <simaishi@redhat.com>
Date: Wed, 29 Nov 2017 20:39:49 -0500
Subject: [PATCH] Change config path to be relative to script

---
 README.md          |  1 -
 scripts/vmbuild.rb | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8095e026..9f5c0407 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,6 @@ Below are instructions on installing and configuring a virtual machine to genera
     git clone https://www.github.com/ManageIQ/manageiq-appliance-build.git
     ln -s manageiq-appliance-build/bin     bin
     ln -s manageiq-appliance-build/scripts scripts
-    ln -s manageiq-appliance-build/config  config
       ```
 
 ## Setup Imagefactory:
diff --git a/scripts/vmbuild.rb b/scripts/vmbuild.rb
index d1b85464..5c267bc7 100644
--- a/scripts/vmbuild.rb
+++ b/scripts/vmbuild.rb
@@ -32,7 +32,7 @@
 
 BUILD_BASE          = Pathname.new("/build")
 GPG_DIR             = Pathname.new("/root/.gnupg")
-CFG_DIR             = BUILD_BASE.join("config")
+CFG_DIR             = Pathname.new(__dir__).join("../config")
 FILESHARE_DIR       = BUILD_BASE.join("fileshare")
 REFS_DIR            = BUILD_BASE.join("references")
 IMGFAC_DIR          = BUILD_BASE.join("imagefactory")
@@ -64,9 +64,9 @@
 
 $log.info "Using Configuration base directory: #{cfg_base}"
 
-base_file = BUILD_BASE.join("config/base.json")
-target_file = BUILD_BASE.join("config/target.json")
-ova_file = BUILD_BASE.join("config/ova.json")
+base_file   = CFG_DIR.join("base.json")
+target_file = CFG_DIR.join("target.json")
+ova_file    = CFG_DIR.join("ova.json")
 
 def verify_run(output)
   if output =~ /UUID: (.*)/
@@ -109,7 +109,7 @@ def verify_run(output)
     $log.info "Building for #{target}:"
 
     tdl_name = target.name == "azure" ? "base_azure.tdl" : "base.tdl"
-    tdl_file = BUILD_BASE.join("config", tdl_name)
+    tdl_file = CFG_DIR.join(tdl_name)
     $log.info "Using inputs: puddle: #{puddle}, build_label: #{build_label}"
     $log.info "              tdl_file: #{tdl_file}, ova_file: #{ova_file}."