Use md5sum rather than md5

unacast · Jun 9, 2020 · 6f5b8ef · 6f5b8ef
1 parent 3d11d5c
commit 6f5b8ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/brokkr/brokkr.mk b/brokkr/brokkr.mk
@@ -7,7 +7,7 @@ _BROKKR_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 # The dir for where to download the dependencies
 _BROKKR_PLUGINS_DIR := $(_BROKKR_DIR)plugins
 # A hash of the plugins, so that we can spot changes
-_BROKKR_PLUGINS_SENTINEL := $(_BROKKR_PLUGINS_DIR)/$(shell echo '$(BROKKR_PLUGINS)' | md5).sentinel
+_BROKKR_PLUGINS_SENTINEL := $(_BROKKR_PLUGINS_DIR)/$(shell echo '$(BROKKR_PLUGINS)' | md5sum | cut -d ' ' -f1).sentinel
 # The dependencies file, a working file for adding "include" to downloaded plugins
 _BROKKR_PLUGINS_MK := $(_BROKKR_PLUGINS_DIR)/plugins.mk
 
@@ -23,7 +23,7 @@ $(_BROKKR_PLUGINS_SENTINEL): $(_BROKKR_PLUGINS_DIR)
 # http(s) url's are converted to a filename safe download path
 $(_BROKKR_PLUGINS_MK): $(_BROKKR_PLUGINS_SENTINEL)
 	# Clean working dir, except sentinel
-	find $(_BROKKR_PLUGINS_DIR) -type f -not -name "`basename $(_BROKKR_PLUGINS_SENTINEL)`" | xargs rm
+	find $(_BROKKR_PLUGINS_DIR) -type f -not -name "`basename $(_BROKKR_PLUGINS_SENTINEL)`" | xargs rm || echo no files to delete
 	for var in $(BROKKR_PLUGINS); do \
 		plugin_version=`echo $$var | cut -d '@' -f 2`;\
 		plugin_path=`echo $$var | cut -d '@' -f 1`; \

diff --git a/plugins/airflow/airflow.mk b/plugins/airflow/airflow.mk
@@ -6,9 +6,9 @@ AIRFLOW_DOCKER_ENVIRONMENT_VARS_SENTINEL=$(AIRFLOW_SENTINELS_FOLDER)/docker-env-
 AIRFLOW_SENTINELS_FOLDER=$(AIRFLOW_WORKFOLDER)/sentinels
 COMPOSE_PROJECT_NAME=$(notdir $(CURDIR))
 AIRFLOW_DOCKERFILE=$(AIRFLOW_WORKFOLDER)/Dockerfile
-AIRFLOW_ENV_VARS_HASH=$(shell echo '$(AIRFLOW_ENVIRONMENT_VARS)' | md5)
+AIRFLOW_ENV_VARS_HASH=$(shell echo '$(AIRFLOW_ENVIRONMENT_VARS)' | md5sum | cut -d ' ' -f1)
 AIRFLOW_VARIABLES_SENTINEL=$(AIRFLOW_SENTINELS_FOLDER)/variables-imported.sentinel
-AIRFLOW_VERSION_SENTINEL=$(AIRFLOW_SENTINELS_FOLDER)/airflow_version_$(shell echo '$(AIRFLOW_ENVIRONMENT_VARS)' | md5).sentinel
+AIRFLOW_VERSION_SENTINEL=$(AIRFLOW_SENTINELS_FOLDER)/airflow_version_$(shell echo '$(AIRFLOW_ENVIRONMENT_VARS)' | md5sum | cut -d ' ' -f1).sentinel
 BROKKR_AIRFLOW_PLUGIN_VERSION=$(shell echo $(BROKKR_PLUGINS) | grep -o1 -Ei "airflow/airflow@([0-9a-z\.]+)" | cut -d "@" -f2)
 AIRFLOW_VERSION ?= 1.10.6
 AIRFLOW_DOCKER_IMAGE ?= unacast/airflow:$(AIRFLOW_VERSION)