chore: Make output more consistent

Author: NickLarsenNZ

druid/upload_new_druid_version.sh

@@ -38,7 +38,7 @@ cd "$WORK_DIR" || exit
 
 src_file="apache-druid-${VERSION}-src.tar.gz"
 
-echo "Downloading Druid (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Druid source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/${VERSION}/${src_file}"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/${VERSION}/${src_file}.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/${VERSION}/${src_file}.sha512"

hadoop/upload_new_hadoop_version.sh

@@ -39,16 +39,16 @@ cd "$WORK_DIR" || exit
 bin_file=hadoop-$VERSION.tar.gz
 src_file=hadoop-$VERSION-src.tar.gz
 
-echo "Downloading Hadoop (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Hadoop binary (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$bin_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$bin_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$bin_file.sha512"
 
+echo "Downloading Hadoop source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$src_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hadoop-$VERSION/$src_file.sha512"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA512 Checksums"
 if ! (sha512sum --tag "$bin_file" | diff - "$bin_file.sha512" && sha512sum --tag "$src_file" | diff - "$src_file.sha512"); then

hbase/upload_new_hbase-operator-tools_version.sh

@@ -38,12 +38,11 @@ cd "$WORK_DIR" || exit
 
 src_file=hbase-operator-tools-$VERSION-src.tar.gz
 
-echo "Downloading hbase-operator-tools (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading hbase-operator-tools source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hbase-operator-tools-$VERSION/$src_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hbase-operator-tools-$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hbase-operator-tools-$VERSION/$src_file.sha512"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA512 Checksums"
 if ! (gpg --print-md SHA512 "$src_file" | diff - "$src_file.sha512"); then

hbase/upload_new_phoenix_version.sh

@@ -38,12 +38,11 @@ cd "$WORK_DIR" || exit
 
 src_file=phoenix-$VERSION-src.tar.gz
 
-echo "Downloading phoenix (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading phoenix source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-$VERSION/$src_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-$VERSION/$src_file.sha512"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA512 Checksums"
 if ! (gpg --print-md SHA512 "$src_file" | diff - "$src_file.sha512"); then

hive/upload_new_hive_version.sh

@@ -39,17 +39,16 @@ cd "$WORK_DIR" || exit
 bin_file="apache-hive-${VERSION}-bin.tar.gz"
 src_file="apache-hive-$VERSION-src.tar.gz"
 
-echo "Downloading Hive Binary (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Hive binary (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${bin_file}"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${bin_file}.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${bin_file}.sha256"
 
-echo "Downloading Hive Source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Hive source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${src_file}"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${src_file}.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/hive-${VERSION}/${src_file}.sha256"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA256 Checksums"
 if ! (sha256sum "${bin_file}" | diff - "${bin_file}.sha256" && sha256sum "${src_file}" | diff - "${src_file}.sha256"); then

kafka/upload_new_kafka_version.sh

@@ -39,11 +39,12 @@ cd "$WORK_DIR" || exit
 bin_file=kafka_2.13-$VERSION.tgz
 src_file=kafka-$VERSION-src.tgz
 
-echo "Downloading Kafka (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Kafka binary (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$bin_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$bin_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$bin_file.sha512"
 
+echo "Downloading Kafka source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$src_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/$VERSION/$src_file.sha512"

omid/upload_new_omid_version.sh

@@ -37,12 +37,11 @@ trap cleanup EXIT
 cd "$WORK_DIR" || exit
 src_file=phoenix-omid-$VERSION-src.tar.gz
 
-echo "Downloading Omid (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Omid source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-omid-${VERSION}/${src_file}"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-omid-$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/phoenix-omid-$VERSION/$src_file.sha512"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA512 Checksums"
 if ! (gpg --print-md SHA512 "$src_file" | diff - "$src_file.sha512"); then

spark-k8s/upload_new_spark_version.sh

@@ -38,7 +38,7 @@ cd "$WORK_DIR" || exit
 
 src_file="spark-${VERSION}.tgz"
 
-echo "Downloading Spark (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
+echo "Downloading Spark source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/spark-${VERSION}/${src_file}"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/spark-${VERSION}/${src_file}.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/spark-${VERSION}/${src_file}.sha512"

zookeeper/upload_new_zookeeper_version.sh

@@ -39,17 +39,16 @@ cd "$WORK_DIR" || exit
 bin_file=apache-zookeeper-$VERSION-bin.tar.gz
 src_file=apache-zookeeper-$VERSION.tar.gz
 
-echo "Downloading ZooKeeper (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
+echo "Downloading ZooKeeper binary (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$bin_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$bin_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$bin_file.sha512"
 
-echo "Downloading ZooKeeper sources (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
+echo "Downloading ZooKeeper source (if this fails, try switching the BASE_DOWNLOAD_URL to the archive)"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$src_file"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$src_file.asc"
 curl --fail -LO --progress-bar "${BASE_DOWNLOAD_URL}/zookeeper-$VERSION/$src_file.sha512"
 
-
 # It is probably redundant to check both the checksum and the signature but it's cheap and why not
 echo "Validating SHA512 Checksums for binary releases"
 if ! (sha512sum "$bin_file" | diff -Z - "$bin_file.sha512"); then