Skip to content

Commit f381ee6

Browse files
authored
Merge pull request #546 from vvoland/fix-diff
diff: Don't force colors
2 parents 44a2f93 + 9c2a9e0 commit f381ee6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

diff.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ TMP_DIR=$(mktemp -d)
4141
curl -sfSL "https://$SUBDOMAIN.docker.com" -o "$TMP_DIR/install.sh"
4242

4343
echo "# Diff $CHANNEL install.sh"
44-
if ! diff --color=always -u "$TMP_DIR/install.sh" "build/$CHANNEL/install.sh"; then
44+
if ! diff -u "$TMP_DIR/install.sh" "build/$CHANNEL/install.sh"; then
4545
DIFF_FOUND=1
4646
fi
4747

4848
# For stable channel, also compare rootless-install.sh
4949
if [[ "$CHANNEL" == "stable" ]]; then
5050
curl -sfSL "https://$SUBDOMAIN.docker.com/rootless" -o "$TMP_DIR/rootless-install.sh"
5151
echo "# Diff $CHANNEL rootless-install.sh"
52-
if ! diff --color=always -u "$TMP_DIR/rootless-install.sh" "build/$CHANNEL/rootless-install.sh"; then
52+
if ! diff -u "$TMP_DIR/rootless-install.sh" "build/$CHANNEL/rootless-install.sh"; then
5353
DIFF_FOUND=1
5454
fi
5555
fi

0 commit comments

Comments
 (0)