From 4c4d9967d0aa0db8306eb8088523da1152f9af68 Mon Sep 17 00:00:00 2001 From: "Hansen, Tony (th1395)" Date: Mon, 8 Jun 2020 21:01:47 +0000 Subject: [PATCH] fix for mvn-phase-lib.sh Change-Id: I7b3340024bf84206d79c18b10290a1e0f0129304 Signed-off-by: Hansen, Tony (th1395) Issue-ID: DCAEGEN2-2207 Signed-off-by: Hansen, Tony (th1395) --- ...{clamppolicy-node-type.yaml => clamppolicyplugin-type.yaml} | 0 .../{dcaepolicy-node-type.yaml => dcaepolicyplugin-type.yaml} | 0 dmaap/{dmaap.yaml => dmaap-type.yaml} | 0 k8s/{k8s-node-type.yaml => k8splugin-type.yaml} | 0 mvn-phase-lib.sh | 10 +++++----- pgaas/{pgaas_types.yaml => pgaas-type.yaml} | 0 .../{relationship-types.yaml => relationshipplugin-type.yaml} | 0 sshkeyshare/{sshkey_types.yaml => sshkeyshare-type.yaml} | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename clamp-policy/{clamppolicy-node-type.yaml => clamppolicyplugin-type.yaml} (100%) rename dcae-policy/{dcaepolicy-node-type.yaml => dcaepolicyplugin-type.yaml} (100%) rename dmaap/{dmaap.yaml => dmaap-type.yaml} (100%) rename k8s/{k8s-node-type.yaml => k8splugin-type.yaml} (100%) rename pgaas/{pgaas_types.yaml => pgaas-type.yaml} (100%) rename relationships/{relationship-types.yaml => relationshipplugin-type.yaml} (100%) rename sshkeyshare/{sshkey_types.yaml => sshkeyshare-type.yaml} (100%) diff --git a/clamp-policy/clamppolicy-node-type.yaml b/clamp-policy/clamppolicyplugin-type.yaml similarity index 100% rename from clamp-policy/clamppolicy-node-type.yaml rename to clamp-policy/clamppolicyplugin-type.yaml diff --git a/dcae-policy/dcaepolicy-node-type.yaml b/dcae-policy/dcaepolicyplugin-type.yaml similarity index 100% rename from dcae-policy/dcaepolicy-node-type.yaml rename to dcae-policy/dcaepolicyplugin-type.yaml diff --git a/dmaap/dmaap.yaml b/dmaap/dmaap-type.yaml similarity index 100% rename from dmaap/dmaap.yaml rename to dmaap/dmaap-type.yaml diff --git a/k8s/k8s-node-type.yaml b/k8s/k8splugin-type.yaml similarity index 100% rename from k8s/k8s-node-type.yaml rename to k8s/k8splugin-type.yaml diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh index 9dc4e9a..152df24 100644 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.sh @@ -252,7 +252,7 @@ build_wagons() CURDIR=$(pwd) for SETUPFILE in $SETUPFILES; do PLUGIN_DIR=$(dirname "$SETUPFILE") - PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_NAME=$(grep 'name[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') echo "In $PLUGIN_DIR, build plugin $PLUGIN_NAME, version $PLUGIN_VERSION" @@ -277,7 +277,7 @@ build_archives_for_wagons() for SETUPFILE in $SETUPFILES; do PLUGIN_FULL_DIR=$(dirname "$SETUPFILE") PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR") - PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_NAME=$(grep 'name[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') cd "${PLUGIN_FULL_DIR}"/.. @@ -351,7 +351,7 @@ upload_wagon_archives() for SETUPFILE in $SETUPFILES; do PLUGIN_FULL_DIR=$(dirname "$SETUPFILE") PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR") - PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_NAME=$(grep 'name[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') cd "${PLUGIN_FULL_DIR}"/.. @@ -382,14 +382,14 @@ upload_wagons_and_type_yamls() CURDIR=$(pwd) for SETUPFILE in $SETUPFILES; do PLUGIN_DIR=$(dirname "$SETUPFILE") - PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_NAME=$(grep 'name[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') PLUGIN_VERSION_MAJOR=$(echo "$PLUGIN_VERSION" | cut -f1 -d'.') PLUGIN_VERSION_MAJOR_MINOR=$(echo "$PLUGIN_VERSION" | cut -f1-2 -d'.') echo "Found setup file in $PLUGIN_DIR, for plugin $PLUGIN_NAME version $PLUGIN_VERSION" - TYPEFILE_NAME=$(grep -R "package_name:[[:space:]]*${PLUGIN_NAME}" | cut -f1 -d ':') + TYPEFILE_NAME=$( grep -l "package_name:[[:space:]]*${PLUGIN_NAME}" * 2>/dev/null ) if [ -z "$TYPEFILE_NAME" ]; then echo "!!! No typefile found with matching package name $PLUGIN_NAME" exit -1 diff --git a/pgaas/pgaas_types.yaml b/pgaas/pgaas-type.yaml similarity index 100% rename from pgaas/pgaas_types.yaml rename to pgaas/pgaas-type.yaml diff --git a/relationships/relationship-types.yaml b/relationships/relationshipplugin-type.yaml similarity index 100% rename from relationships/relationship-types.yaml rename to relationships/relationshipplugin-type.yaml diff --git a/sshkeyshare/sshkey_types.yaml b/sshkeyshare/sshkeyshare-type.yaml similarity index 100% rename from sshkeyshare/sshkey_types.yaml rename to sshkeyshare/sshkeyshare-type.yaml -- 2.16.6