diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-05-23 13:59:12 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-05-23 13:59:12 -0400 |
| commit | a9e0e1c94d9b1fee783ce2db3df962b6fec5149b (patch) | |
| tree | 329adf4f33ff3659d60bcd06dbce8c148dfe1eaa | |
| parent | 0d031d73f1a79ba1fff6a6022c679f9d81a7417a (diff) | |
Fix xpath syntax for CentOS
Change-Id: I5f287b9541a20713b25a573879e44a4f37099141
Issue-ID: DCAEGEN2-1520
Signed-off-by: Jack Lucas <jflucas@research.att.com>
| -rw-r--r-- | mvn-phase-lib.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh index e1e4dfa..dbe3397 100644 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.sh @@ -299,8 +299,8 @@ build_archives_for_wagons() upload_raw_file() { # Extract the username and password to the nexus repo from the settings file - USER=$(xpath "//servers/server[id='$MVN_RAWREPO_SERVERID']/username/text()" "$SETTINGS_FILE") - PASS=$(xpath "//servers/server[id='$MVN_RAWREPO_SERVERID']/password/text()" "$SETTINGS_FILE") + USER=$(xpath "$SETTINGS_FILE" "//servers/server[id='$MVN_RAWREPO_SERVERID']/username/text()") + PASS=$(xpath "$SETTINGS_FILE" "//servers/server[id='$MVN_RAWREPO_SERVERID']/password/text()") NETRC=$(mktemp) echo "machine $MVN_RAWREPO_HOST login $USER password $PASS" > "$NETRC" @@ -441,8 +441,8 @@ upload_files_of_extension_recursively() generate_pypirc_then_publish() { set +x - USER=$(xpath "//servers/server[id='$MVN_PYPISERVER_SERVERID']/username/text()" "$SETTINGS_FILE") - PASS=$(xpath "//servers/server[id='$MVN_PYPISERVER_SERVERID']/password/text()" "$SETTINGS_FILE") + USER=$(xpath "$SETTINGS_FILE" "//servers/server[id='$MVN_PYPISERVER_SERVERID']/username/text()") + PASS=$(xpath "$SETTINGS_FILE" "//servers/server[id='$MVN_PYPISERVER_SERVERID']/password/text()") if [[ "$MVN_PYPISERVER_BASEURL" != */ ]]; then MVN_PYPISERVER_BASEURL="${MVN_PYPISERVER_BASEURL}/" @@ -507,8 +507,8 @@ build_and_push_docker() echo "DEPLOYMENT_TYPE is: $MVN_DEPLOYMENT_TYPE, repo is $REPO" if [ ! -z "$REPO" ]; then - USER=$(xpath "//servers/server[id='$REPO']/username/text()" "$SETTINGS_FILE") - PASS=$(xpath "//servers/server[id='$REPO']/password/text()" "$SETTINGS_FILE") + USER=$(xpath "$SETTINGS_FILE" "//servers/server[id='$REPO']/username/text()") + PASS=$(xpath "$SETTINGS_FILE" "//servers/server[id='$REPO']/password/text()") if [ -z "$USER" ]; then echo "Error: no user provided" fi |