diff options
| author |   Hansen, Tony (th1395) <th1395@att.com> | 2020-06-08 21:01:47 +0000 |
|---|---|---|
| committer | Hansen, Tony (th1395) <th1395@att.com> | 2020-06-08 21:38:02 +0000 |
| commit | 4c4d9967d0aa0db8306eb8088523da1152f9af68 (patch) | |
| tree | 7f7799e1ae6383673e326380b41ebd0ba0c01bb4 /mvn-phase-lib.sh | |
| parent | 96fb7b13783e4f9958923c4b59d52dc9ff781933 (diff) | |
fix for mvn-phase-lib.sh
Change-Id: I7b3340024bf84206d79c18b10290a1e0f0129304
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Issue-ID: DCAEGEN2-2207
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Diffstat (limited to 'mvn-phase-lib.sh')
| -rw-r--r-- | mvn-phase-lib.sh | 10 |
1 files changed, 5 insertions, 5 deletions
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 |