Skip to content

Commit fb339eb

Browse files
author
Loïc Hoguin
committed
make: Don't search for rabbit/scripts
With the monorepo I do not believe we need to worry about where the scripts are. They are always in deps/rabbit/scripts. So we copy them from there directly. This does not improve performance but should work better on older environments.
1 parent c1559f6 commit fb339eb

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

deps/rabbit_common/mk/rabbitmq-dist.mk

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -224,45 +224,22 @@ endif
224224
install-cli: install-cli-scripts install-cli-escripts
225225
@:
226226

227-
ifeq ($(PROJECT),rabbit)
228-
install-cli-scripts:
229-
$(gen_verbose) \
230-
if command -v flock >/dev/null; then \
231-
flock $(CLI_SCRIPTS_LOCK) \
232-
sh -c 'mkdir -p "$(CLI_SCRIPTS_DIR)" && cp -a scripts/* $(CLI_SCRIPTS_DIR)/'; \
233-
elif command -v lockf >/dev/null; then \
234-
lockf $(CLI_SCRIPTS_LOCK) \
235-
sh -c 'mkdir -p "$(CLI_SCRIPTS_DIR)" && cp -a scripts/* $(CLI_SCRIPTS_DIR)/'; \
236-
else \
237-
mkdir -p "$(CLI_SCRIPTS_DIR)" && cp -a scripts/* $(CLI_SCRIPTS_DIR)/; \
238-
fi
239-
else
240-
241227
install-cli-scripts:
242228
$(gen_verbose) \
243229
set -e; \
244-
if test -d "$(DEPS_DIR)/rabbit/scripts"; then \
245-
rabbit_scripts_dir='$(DEPS_DIR)/rabbit/scripts'; \
246-
elif test -d "$(DEPS_DIR)/../scripts"; then \
247-
rabbit_scripts_dir='$(DEPS_DIR)/../scripts'; \
248-
else \
249-
echo 'rabbit/scripts directory not found' 1>&2; \
250-
exit 1; \
251-
fi; \
252-
test -d "$$rabbit_scripts_dir"; \
230+
test -d "$(DEPS_DIR)/rabbit/scripts"; \
253231
if command -v flock >/dev/null; then \
254232
flock $(CLI_SCRIPTS_LOCK) \
255233
sh -e -c 'mkdir -p "$(CLI_SCRIPTS_DIR)" && \
256-
cp -a "'$$rabbit_scripts_dir'"/* $(CLI_SCRIPTS_DIR)/'; \
234+
cp -a $(DEPS_DIR)/rabbit/scripts/* $(CLI_SCRIPTS_DIR)/'; \
257235
elif command -v lockf >/dev/null; then \
258236
lockf $(CLI_SCRIPTS_LOCK) \
259237
sh -e -c 'mkdir -p "$(CLI_SCRIPTS_DIR)" && \
260-
cp -a "'$$rabbit_scripts_dir'"/* $(CLI_SCRIPTS_DIR)/'; \
238+
cp -a $(DEPS_DIR)/rabbit/scripts/* $(CLI_SCRIPTS_DIR)/'; \
261239
else \
262240
mkdir -p "$(CLI_SCRIPTS_DIR)" && \
263-
cp -a "'$$rabbit_scripts_dir'"/* $(CLI_SCRIPTS_DIR)/; \
241+
cp -a $(DEPS_DIR)/rabbit/scripts/* $(CLI_SCRIPTS_DIR)/; \
264242
fi
265-
endif
266243

267244
install-cli-escripts:
268245
$(gen_verbose) \

0 commit comments

Comments
 (0)