From c33b1929bbc52f8e925b2aac399ca954a16050d9 Mon Sep 17 00:00:00 2001
From: Ross Brattain <ross.b.brattain@intel.com>
Date: Thu, 9 Mar 2017 00:24:55 -0800
Subject: ubuntu-server-cloudimg-dpdk-modify.sh: fixes and cleanup

https://build.opnfv.org/ci/view/fuel/job/yardstick-fuel-virtual-daily-master/1233/console

saw this in an error log, not sure if it is a real error

+ [[ amd64 = \a\r\m\6\4 ]]
+ git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
fatal: destination path '/opt/tempT' already exists and is not an empty directory.
+ error_trap
+ local rc=128
+ set +e
+ '[' -z '' ']'
+ exitcode=128

workaround by deletign /opt/tempT always before cloning

also improve ln with relative symlink and forcing filename target

Change-Id: I6715e6dba76b79706d396b616eae980e5ace773b
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---
 tools/ubuntu-server-cloudimg-dpdk-modify.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/ubuntu-server-cloudimg-dpdk-modify.sh b/tools/ubuntu-server-cloudimg-dpdk-modify.sh
index 9a3857ee3..847c5053c 100755
--- a/tools/ubuntu-server-cloudimg-dpdk-modify.sh
+++ b/tools/ubuntu-server-cloudimg-dpdk-modify.sh
@@ -59,7 +59,7 @@ chpasswd: { expire: False }
 ssh_pwauth: True
 EOF
 
-linuxheadersversion=`echo ls boot/vmlinuz* | cut -d- -f2-`
+linuxheadersversion=$(echo ls boot/vmlinuz* | cut -d- -f2-)
 
 apt-get update
 apt-get install -y \
@@ -80,22 +80,25 @@ apt-get install -y \
     rt-tests \
     stress \
     sysstat \
-    linux-headers-$linuxheadersversion \
+    linux-headers-"${linuxheadersversion}" \
     libpcap-dev \
     lua5.2
 
 git clone http://dpdk.org/git/dpdk
 git clone http://dpdk.org/git/apps/pktgen-dpdk
 
-git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
-make --directory /opt/tempT/UnixBench/
+CLONE_DEST=/opt/tempT
+# remove before cloning
+rm -rf -- "${CLONE_DEST}"
+git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
+make --directory "${CLONE_DEST}/UnixBench/"
 
-git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
-cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
+cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
 mkdir temp
 bash build.sh
 
-git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}"/Cachestat
 
 # restore symlink
-ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf
+ln -sfrT /run/resolvconf/resolv.conf /etc/resolv.conf
-- 
cgit 1.2.3-korg