From 87776565a6029b39c414229cc8aaf548a9f91f5e Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 26 Sep 2023 12:25:42 +0300 Subject: [PATCH] fix build script Signed-off-by: Michael Sverdlov --- build/deb_rpm/v2-jf/build-scripts/pack.sh | 6 +++--- build/deb_rpm/v2-jf/build-scripts/rpm-install.sh | 13 +++++-------- build/deb_rpm/v2/build-scripts/pack.sh | 4 ++-- build/deb_rpm/v2/build-scripts/rpm-install.sh | 13 +++++-------- build/npm/v2-jf/package-lock.json | 11 ----------- build/npm/v2/package-lock.json | 11 ----------- 6 files changed, 15 insertions(+), 43 deletions(-) diff --git a/build/deb_rpm/v2-jf/build-scripts/pack.sh b/build/deb_rpm/v2-jf/build-scripts/pack.sh index 6632502d5..7a02590aa 100755 --- a/build/deb_rpm/v2-jf/build-scripts/pack.sh +++ b/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}" \ diff --git a/build/deb_rpm/v2-jf/build-scripts/rpm-install.sh b/build/deb_rpm/v2-jf/build-scripts/rpm-install.sh index 82e32dab4..6eaceadb5 100644 --- a/build/deb_rpm/v2-jf/build-scripts/rpm-install.sh +++ b/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; diff --git a/build/deb_rpm/v2/build-scripts/pack.sh b/build/deb_rpm/v2/build-scripts/pack.sh index c3038cb0d..90e904962 100755 --- a/build/deb_rpm/v2/build-scripts/pack.sh +++ b/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" diff --git a/build/deb_rpm/v2/build-scripts/rpm-install.sh b/build/deb_rpm/v2/build-scripts/rpm-install.sh index 61c8aba13..5ac712e88 100644 --- a/build/deb_rpm/v2/build-scripts/rpm-install.sh +++ b/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; diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 5038131fa..6f3b862d8 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -3,15 +3,4 @@ "version": "2.48.0", "lockfileVersion": 2, "requires": true, - "packages": { - "": { - "name": "jfrog-cli-v2-jf", - "version": "2.48.0", - "hasInstallScript": true, - "license": "Apache 2.0", - "bin": { - "jf": "bin/jf" - } - } - } } diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index a54825e32..aec377332 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -3,15 +3,4 @@ "version": "2.48.0", "lockfileVersion": 2, "requires": true, - "packages": { - "": { - "name": "jfrog-cli-v2", - "version": "2.48.0", - "hasInstallScript": true, - "license": "Apache 2.0", - "bin": { - "jfrog": "bin/jfrog" - } - } - } }