X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fscripts%2Fopenvswitch-build.sh;h=61ae9b4b8abb8fd381b203adc80c29cf067666ac;hb=6571295b675f07a2fa22048f5f8257c1f9dfd18c;hp=2d379c7515dbb045cbb0bef258384da338dbcaa6;hpb=a70a6aa4295a49f2fa018deed83db572e70d393e;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/scripts/openvswitch-build.sh b/jjb/opflex/scripts/openvswitch-build.sh
index 2d379c751..61ae9b4b8 100644
--- a/jjb/opflex/scripts/openvswitch-build.sh
+++ b/jjb/opflex/scripts/openvswitch-build.sh
@@ -23,9 +23,9 @@ mkdir -p "$DESTDIR"
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
 make -j4
-DESTDIR=`pwd`/$DESTDIR make install
+DESTDIR=$(pwd)/$DESTDIR make install
 
-if [[ $OPENVSWITCH_VERSION =~ 2.6.0 ]]; then
+if [[ $OPENVSWITCH_VERSION =~ 2.12.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openvswitch/*.h $DESTDIR/$ROOT/include/openvswitch/openvswitch
     mv $DESTDIR/$ROOT/include/openflow $DESTDIR/$ROOT/include/openvswitch
@@ -36,9 +36,9 @@ elif [[ $OPENVSWITCH_VERSION =~ noiro ]]; then
 fi
 
 pushd $DESTDIR
-tar -cvzf "openvswitch-$OPENVSWITCH_VERSION.tar.gz" *
+tar cvzf "openvswitch-$OPENVSWITCH_VERSION.tar.gz" -- *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd