fix build script

Signed-off-by: Michael Sverdlov <[email protected]>

build/deb_rpm/v2-jf/build-scripts/pack.sh

@@ -63,7 +63,7 @@ createDEBPackage(){
 	local flavour="deb"
 
 	# cleanup old files and containers
-	rm -f "${JFROG_CLI_PKG}"/${JFROG_CLI_PREFIX}*"${VERSION_FORMATTED}"*.${flavour}
+	rm -f  "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}"
 	docker rm -f "${RPM_BUILDER_NAME}" 2>/dev/null
 
 	log "Building ${JFROG_CLI_PREFIX} ${flavour} ${JFROG_CLI_VERSION} on ${DEB_BUILD_IMAGE} image"
@@ -106,7 +106,7 @@ createRPMPackage(){
 	local flavour="rpm"
 
 	# cleanup old files and containers
-	rm -f "${JFROG_CLI_PKG}"/${JFROG_CLI_PREFIX}*"${VERSION_FORMATTED}"*.${flavour}
+	rm -f  "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}"
 	docker rm -f "${RPM_BUILDER_NAME}" 2>/dev/null
 
 	log "Building ${JFROG_CLI_PREFIX} ${flavour} ${JFROG_CLI_VERSION} on ${RPM_BUILD_IMAGE} image"
@@ -158,7 +158,7 @@ rpmSign()(
  	if [[ -f "${filePath}" && -f "${gpgFileInHost}" ]]; then
  		log ""; log "";
  		log "Initiating rpm sign on ${filePath}..."
- 		docker run --rm --name cli-rpm-sign -v "${filePath}"":${filePathInImage}" \
+ 		docker run --rm --name cli-rpm-sign -v "${filePath}:${filePathInImage}" \
  			-v "${gpgFileInHost}":"${gpgFileInImage}" \
  			-v "${JFROG_CLI_HOME}/build-scripts":${RPM_IMAGE_ROOT_DIR}/src \
  			"${RPM_SIGN_IMAGE}" \

build/deb_rpm/v2-jf/build-scripts/rpm-install.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-{
-  echo "[jfrog-cli]"
-  echo "name=jfrog-cli"
-  echo "baseurl=https://releases.jfrog.io/artifactory/jfrog-rpms"
-  echo "enabled=1"
-  echo "gpgcheck=0"
-} >> jfrog-cli.repo
-sudo mv jfrog-cli.repo /etc/yum.repos.d/;
+echo -e "[jfrog-cli]
+name=jfrog-cli
+baseurl=https://releases.jfrog.io/artifactory/jfrog-rpms
+enabled=1
+gpgcheck=0" | sudo tee /etc/yum.repos.d/jfrog-cli.repo >/dev/null
 yum install -y jfrog-cli-v2-jf;

build/deb_rpm/v2/build-scripts/pack.sh

@@ -63,7 +63,7 @@ createDEBPackage(){
 	local flavour="deb"
 
 	# cleanup old files and containers
-	rm -f "${JFROG_CLI_PKG}"/${JFROG_CLI_PREFIX}*"${VERSION_FORMATTED}"*.${flavour}
+	rm -f "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}"
 	docker rm -f "${RPM_BUILDER_NAME}" 2>/dev/null
 
 	log "Building ${JFROG_CLI_PREFIX} ${flavour} ${JFROG_CLI_VERSION} on ${DEB_BUILD_IMAGE} image"
@@ -106,7 +106,7 @@ createRPMPackage(){
 	local flavour="rpm"
 
 	# cleanup old files and containers
-	rm -f "${JFROG_CLI_PKG}"/${JFROG_CLI_PREFIX}*"${VERSION_FORMATTED}"*.${flavour}
+	rm -f  "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}"
 	docker rm -f "${RPM_BUILDER_NAME}" 2>/dev/null
 
 	log "Building ${JFROG_CLI_PREFIX} ${flavour} ${JFROG_CLI_VERSION} on ${RPM_BUILD_IMAGE} image"

build/deb_rpm/v2/build-scripts/rpm-install.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-{
-  echo "[jfrog-cli]"
-  echo "name=jfrog-cli"
-  echo "baseurl=https://releases.jfrog.io/artifactory/jfrog-rpms"
-  echo "enabled=1"
-  echo "gpgcheck=0"
-} >> jfrog-cli.repo
-sudo mv jfrog-cli.repo /etc/yum.repos.d/;
+echo -e "[jfrog-cli]
+name=jfrog-cli
+baseurl=https://releases.jfrog.io/artifactory/jfrog-rpms
+enabled=1
+gpgcheck=0" | sudo tee /etc/yum.repos.d/jfrog-cli.repo >/dev/null
 yum install -y jfrog-cli-v2;
 jf intro;