commit f3a91cd5f5bc8636eeda091992ae1a3aaff00b9b
author Mike Frysinger <vapier@chromium.org> Tue Feb 02 00:04:38 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Thu Feb 04 00:07:40 2021 +0000
tree 6202756e2773efc600c5001a4e78d9186895925c
parent 2946606a4f6bfc9e052b4cd4fc711b16c406857f

cros_mirror: support simple hostname command

If `hostname -f` fails, fallback to plain `hostname`.

BUG=chromium:322261
TEST=CQ passes

Change-Id: I9a3d8a5488181170516098138fde4cfae091edda
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2666926
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>

scripts/cros_mirror

diff --git a/scripts/cros_mirror b/scripts/cros_mirror
index 9231781..15b143a 100755
--- a/scripts/cros_mirror
+++ b/scripts/cros_mirror
@@ -66,7 +66,7 @@
 
 Example:
 # Create a full mirror in \${PWD} and have users fetch from the local machine.
-\$ ${ARGV0} -r . -u git://$(hostname -f)
+\$ ${ARGV0} -r . -u git://${HOSTNAME}
 # Update the mirror (put this into a cronjob).
 \$ ${ARGV0} -q -r ${ROOT:-${PWD}}
 
@@ -76,6 +76,7 @@
   exit ${1:-0}
 }
 
+HOSTNAME=$(hostname -f 2>/dev/null || hostname)
 JOBS=$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)
 MANIFEST_URL=
 MANIFEST_NAME=default.xml
@@ -206,7 +207,7 @@
     URL=$(eval $(grep -h fetch= *.xml); echo ${fetch})
     if [[ ${URL} == "https://chromium.googlesource.com" ]]; then
       # Guess they want the current system.
-      URL="git://$(hostname -f)"
+      URL="git://${HOSTNAME}"
     fi
   fi