From 6692b15f8bd7ffc742cce5b67b963b458f87f8b6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 03:14:11 +0200
Subject: avoid warnings on fresh checkout

---
 scripts/reloc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/reloc.sh b/scripts/reloc.sh
index f7a0a1e3b..59323612f 100755
--- a/scripts/reloc.sh
+++ b/scripts/reloc.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 # execute this after relocation of adk directory
 
-olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2)
+olddir=$(grep "^TOPDIR" prereq.mk 2>/dev/null |cut -d '=' -f 2)
 newdir=$(pwd)
 
-if [ "$olddir" != "$newdir" ];then
+if [ ! -z $olddir ];then
+  if [ "$olddir" != "$newdir" ];then
 	echo "adk directory relocated!"
 	echo "old directory: $olddir"
 	echo "new directory: $newdir"
@@ -13,4 +14,5 @@ if [ "$olddir" != "$newdir" ];then
 	sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs)
 	sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf
 	sed -i -e "s#$olddir#$newdir#" prereq.mk
+  fi
 fi
-- 
cgit v1.2.3