From 3b29d00c69b75883ab4f2cea09b01b9f5b79fb4c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 27 Mar 2018 09:46:33 -0700 Subject: [PATCH] setup-apt-repo: Fix use of shasum alias for sha1sum. This is apparently installed by the perl package; I hadn't even known it existed. We of course want to use the sha1sum command from coreutils. Fixes #8836. --- scripts/lib/setup-apt-repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo index 348553d34b..159e9883d1 100755 --- a/scripts/lib/setup-apt-repo +++ b/scripts/lib/setup-apt-repo @@ -3,7 +3,7 @@ set -x SOURCES_FILE=/etc/apt/sources.list.d/zulip.list STAMP_FILE=/etc/apt/sources.list.d/zulip.list.apt-update-in-progress -zulip_source_hash=`shasum $SOURCES_FILE` +zulip_source_hash=`sha1sum $SOURCES_FILE` apt-get install -y lsb-release @@ -32,7 +32,7 @@ else exit 1 fi -if [ "$zulip_source_hash" = "`shasum $SOURCES_FILE`" ] && ! [ -e "$STAMP_FILE" ]; then +if [ "$zulip_source_hash" = "`sha1sum $SOURCES_FILE`" ] && ! [ -e "$STAMP_FILE" ]; then echo "zulip.list file did not change; skipping apt-get update" else # We create this stamp file to ensure `apt-get update` will be run