Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify conditional statement for ALT_NEXUS_REPO
[releng/global-jjb.git]
/
shell
/
create-netrc.sh
diff --git
a/shell/create-netrc.sh
b/shell/create-netrc.sh
index
8832941
..
52f239d
100644
(file)
--- a/
shell/create-netrc.sh
+++ b/
shell/create-netrc.sh
@@
-13,7
+13,15
@@
echo "---> create-netrc.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
-NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
+ALT_NEXUS_URL="${ALT_NEXUS_URL:-}"
+
+if [ -z "$ALT_NEXUS_URL" ]
+then
+ NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
+else
+ NEXUS_URL="${ALT_NEXUS_URL}"
+fi
+
CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
-t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \
-v x:username -o ":" -v x:password \
CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
-t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \
-v x:username -o ":" -v x:password \
@@
-23,4
+31,4
@@
machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
user=$(echo "$CREDENTIAL" | cut -f1 -d:)
pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
user=$(echo "$CREDENTIAL" | cut -f1 -d:)
pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
-echo "machine $
machine
login $user password $pass" > ~/.netrc
+echo "machine $
{machine%:*}
login $user password $pass" > ~/.netrc