From 688992cf90ecb878a73c7101d7bac4405d5e666c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 9 Oct 2024 15:23:27 +0300 Subject: [PATCH] Removed the duplicate drush uli from make fresh. --- tools/make/project/install.mk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 9e3d7a5..fade4de 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -1,9 +1,9 @@ ifeq ($(DRUPAL_CONF_EXISTS),yes) - DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock drush-uli else - DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli endif -DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock-uli +DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token') @@ -47,11 +47,7 @@ drush-helfi-locale-import: ## Update translations from helfi platform config. $(call drush,helfi:locale-import helfi_platform_config) $(call drush,cr) -PHONY += drush-unblock-uli -drush-unblock-uli: DRUPAL_UID ?= 1 -drush-unblock-uli: DRUPAL_DESTINATION ?= admin/reports/status -drush-unblock-uli: ## Get login link - $(call step,Unblocking user...\n) - $(call drush,user:unblock$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID), --uid=1)) - $(call step,Login to your site with:\n) - $(call drush,uli$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID),) $(DRUPAL_DESTINATION)) +PHONY += drush-unblock +drush-unblock: ## Get login link + $(call step,Unblocking helfi-admin...\n) + $(call drush,user:unblock --uid=1)