From 87fb5339791dfe37c3b3b4e4f5b0cf830471c513 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Tue, 30 Jul 2013 14:23:31 -0400
Subject: [PATCH] Modify relative paths of lib, elements for packaging

(Based on review https://review.openstack.org/#/c/36009)

Scripts test for existence of ../share/diskimage-builder and
fall-back to ../ if not found. This allows scripts to run unmodified
from a packaged installation or a local archive/repository.

Change-Id: I0cf4c1fdb8e42ec284c56860cb15818632b93b9e
---
 bin/disk-image-create     | 8 +++++++-
 bin/disk-image-get-kernel | 9 ++++++++-
 lib/common-defaults       | 2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/bin/disk-image-create b/bin/disk-image-create
index efbcf853a..d36477ce1 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -27,7 +27,13 @@ export DIB_ENV=$(export)
 
 SCRIPTNAME=$(basename $0)
 SCRIPT_HOME=$(dirname $0)
-export _LIB=$(dirname $0)/../lib
+if [ -d $SCRIPT_HOME/../share/diskimage-builder ]
+then
+    export _PREFIX=$SCRIPT_HOME/../share/diskimage-builder
+else
+    export _PREFIX=$SCRIPT_HOME/..
+fi
+export _LIB=$_PREFIX/lib
 source $_LIB/die
 
 IS_RAMDISK=0
diff --git a/bin/disk-image-get-kernel b/bin/disk-image-get-kernel
index b1032a2ea..3c2679c59 100755
--- a/bin/disk-image-get-kernel
+++ b/bin/disk-image-get-kernel
@@ -18,7 +18,14 @@
 set -e
 
 SCRIPTNAME=$(basename $0)
-export _LIB=$(dirname $0)/../lib
+SCRIPT_HOME=$(dirname $0)
+if [ -d $SCRIPT_HOME/../share/diskimage-builder ]
+then
+    export _PREFIX=$SCRIPT_HOME/../share/diskimage-builder
+else
+    export _PREFIX=$SCRIPT_HOME/..
+fi
+export _LIB=$_PREFIX/lib
 source $_LIB/die
 
 function show_options () {
diff --git a/lib/common-defaults b/lib/common-defaults
index ff06fe781..894bf3918 100644
--- a/lib/common-defaults
+++ b/lib/common-defaults
@@ -36,7 +36,7 @@ export ARCH
 export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0}
 # Set via the CLI normally.
 # IMAGE_ELEMENT=
-_BASE_ELEMENT_DIR=$(dirname $0)/../elements
+_BASE_ELEMENT_DIR=$_PREFIX/elements
 ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
 export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}
 export DIB_OFFLINE=${DIB_OFFLINE:-''}