diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-11 21:34:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 21:34:59 +0100 |
| commit | 1a832263f78559432fc40f53b8e39df3b1b88015 (patch) | |
| tree | 808fadc1f25fb3eeaa18d1bba54470f5a59dd51a | |
| parent | bfb51a57390f651d00e2cb641975a29e74c3691c (diff) | |
| parent | 344cad083003b33384439476e6e4d70fee6b6917 (diff) | |
Merge pull request #20473 from vespa-engine/toregge/use-md5-instead-of-md5sum-on-darwin
Use md5 command instead of md5sum on darwin.
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index eb446f9a251..5d47392292d 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -19,7 +19,12 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } . libexec/vespa/common-env.sh -DISCRIMINATOR=`echo ${VESPA_CONFIG_ID} | md5sum | cut -d' ' -f1` +if test "$(uname -s)" = Darwin +then + DISCRIMINATOR=`echo ${VESPA_CONFIG_ID} | md5 -r | cut -d' ' -f1` +else + DISCRIMINATOR=`echo ${VESPA_CONFIG_ID} | md5sum | cut -d' ' -f1` +fi CONTAINER_HOME="${VESPA_HOME}/var/jdisc_container/${DISCRIMINATOR}/" ZOOKEEPER_LOG_FILE_PREFIX="${VESPA_HOME}/logs/vespa/zookeeper.${VESPA_SERVICE_NAME}" |