From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 30 Jul 2018 21:28:16 +0000 (+0000)
Subject: Merge "Fix incorrect URL in build-docker"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=5ae9f5758344f6cb934c2078dda13174e723d64a;hp=577f5a513266fef501dd41661250175e30cd9b8f

Merge "Fix incorrect URL in build-docker"
---

diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh
index 6d36f0a..68951af 100644
--- a/jjb/shell/make-tar.sh
+++ b/jjb/shell/make-tar.sh
@@ -14,13 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source $WORKSPACE/version.properties
-TAR_NAME="${PROJECT}-${VERSION}.tgz"
+# shellcheck source="$WORKSPACE/version.properties" disable=SC1091
+dos2unix "${WORKSPACE}/version.properties"
+source "$WORKSPACE/version.properties"
+TAR_NAME="${PROJECT}-${VERSION}-SNAPSHOT.tgz"
 TARDIR=$UPLOAD_FILES_PATH
 
 set -e -u -x -o pipefail
-rm -fr $TARDIR
-mkdir $TARDIR
+rm -fr "$TARDIR"
+mkdir "$TARDIR"
 
 if [ "$PROJECT" == "addon-onap" ]
 then
@@ -28,20 +30,20 @@ then
     # ONAP addon is special.
     # Build the regional controller scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-regional-controller-master"
-    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}.tgz"
+    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}${VERSION}-SNAPSHOT.tgz"
     cd ./src/regional_controller_scripts/
-    tar -cvzf ${TARDIR}/${ARTIFACT_NAME}.tgz *
+    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
 
     # Build the ONAP VM scripts tar ball
     ARTIFACT_NAME="onap-amsterdam-VM-master"
-    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}.tgz"
+    echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz"
     cd ../onap_vm_scripts/
-    tar -cvzf ${TARDIR}/${ARTIFACT_NAME}.tgz *
+    tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- *
 
 else
 
     echo "Making tar file ${TARDIR}/${TAR_NAME}"
-    tar -cvzf ${TARDIR}/${TAR_NAME} *
+    tar -cvzf "${TARDIR}/${TAR_NAME}" -- *
 
 fi
-set +u +x
\ No newline at end of file
+set +u +x