Search for common files in /usr/share/setup-ivi too

Change-Id: If1c3f9f21907130e6688840c59e311f9681c3134
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/setup-extlinux-conf b/setup-extlinux-conf
index 5854f7d4244a4b74aeb071c020c8607a0deda875..9b67c127a9542c782232ba473f50c621673ab84a 100755 (executable)
--- a/setup-extlinux-conf
+++ b/setup-extlinux-conf
@@ -8,7 +8,11 @@ PROG="setup-extlinux-conf"
 VER="1.0"
 
 srcdir="$(readlink -ev -- ${0%/*})"
-. "$srcdir/setup-ivi-sh-functions"
+if [ -f "$srcdir/setup-ivi-sh-functions" ]; then
+       . "$srcdir/setup-ivi-sh-functions"
+else
+       .  /usr/share/setup-ivi/setup-ivi-sh-functions
+fi
 
 # This is a small trick which I use to make sure my scripts are portable -
 # check if 'dash' is present, and if yes - use it.

diff --git a/setup-gummiboot-conf b/setup-gummiboot-conf
index cd9c24522edf2c8dd67be1c221a3ce3515fbaf43..b344029885b313fa47452f4307f8fa75f8f923ff 100755 (executable)
--- a/setup-gummiboot-conf
+++ b/setup-gummiboot-conf
@@ -8,7 +8,11 @@ PROG="setup-gummiboot-conf"
 VER="1.0"
 
 srcdir="$(readlink -ev -- ${0%/*})"
-. "$srcdir/setup-ivi-sh-functions"
+if [ -f "$srcdir/setup-ivi-sh-functions" ]; then
+       . "$srcdir/setup-ivi-sh-functions"
+else
+       .  /usr/share/setup-ivi/setup-ivi-sh-functions
+fi
 
 # This is a small trick which I use to make sure my scripts are portable -
 # check if 'dash' is present, and if yes - use it.

diff --git a/setup-ivi-boot b/setup-ivi-boot
index 09336f0717a23eee136bfe77e26651783869fe80..b020d12952fb915a1c665b377d31099fbb16d3da 100755 (executable)
--- a/setup-ivi-boot
+++ b/setup-ivi-boot
@@ -10,8 +10,13 @@ VER="1.0"
 srcdir="$(readlink -ev -- ${0%/*})"
 PATH="/usr/share/setup-ivi:$srcdir:$PATH"
 
-. "$srcdir/setup-ivi-sh-functions"
-. "$srcdir/installerfw-sh-functions"
+if [ -f "$srcdir/setup-ivi-sh-functions" ]; then
+       . "$srcdir/setup-ivi-sh-functions"
+       . "$srcdir/installerfw-sh-functions"
+else
+       .  /usr/share/setup-ivi/setup-ivi-sh-functions
+       .  /usr/share/setup-ivi/installerfw-sh-functions
+fi
 
 # This is a small trick which I use to make sure my scripts are portable -
 # check if 'dash' is present, and if yes - use it.

diff --git a/setup-ivi-bootloader-conf b/setup-ivi-bootloader-conf
index 4accba16ee0d17826a992593ed3327535576d3a5..85d42b04d818690c253c457235bb821d56c04b76 100755 (executable)
--- a/setup-ivi-bootloader-conf
+++ b/setup-ivi-bootloader-conf
@@ -10,8 +10,13 @@ VER="1.0"
 srcdir="$(readlink -ev -- ${0%/*})"
 PATH="/usr/share/setup-ivi:$srcdir:$PATH"
 
-. "$srcdir/setup-ivi-sh-functions"
-. "$srcdir/installerfw-sh-functions"
+if [ -f "$srcdir/setup-ivi-sh-functions" ]; then
+       . "$srcdir/setup-ivi-sh-functions"
+       . "$srcdir/installerfw-sh-functions"
+else
+       .  /usr/share/setup-ivi/setup-ivi-sh-functions
+       .  /usr/share/setup-ivi/installerfw-sh-functions
+fi
 
 # This is a small trick which I use to make sure my scripts are portable -
 # check if 'dash' is present, and if yes - use it.

diff --git a/setup-ivi-fstab b/setup-ivi-fstab
index a0c1153ef5b511a0bf7735a1e47870198e6a26a2..705fa804f7457f278686efb0fd234885cb13828c 100755 (executable)
--- a/setup-ivi-fstab
+++ b/setup-ivi-fstab
@@ -10,8 +10,13 @@ VER="1.0"
 srcdir="$(readlink -ev -- ${0%/*})"
 PATH="/usr/share/setup-ivi:$srcdir:$PATH"
 
-. "$srcdir/setup-ivi-sh-functions"
-. "$srcdir/installerfw-sh-functions"
+if [ -f "$srcdir/setup-ivi-sh-functions" ]; then
+       . "$srcdir/setup-ivi-sh-functions"
+       . "$srcdir/installerfw-sh-functions"
+else
+       .  /usr/share/setup-ivi/setup-ivi-sh-functions
+       .  /usr/share/setup-ivi/installerfw-sh-functions
+fi
 
 # This is a small trick which I use to make sure my scripts are portable -
 # check if 'dash' is present, and if yes - use it.