Skip to content

Commit

Permalink
Removed the duplicate drush uli from make fresh.
Browse files Browse the repository at this point in the history
  • Loading branch information
khalima committed Oct 9, 2024
1 parent 76d0554 commit 688992c
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions tools/make/project/install.mk
Original file line number Diff line number Diff line change
@@ -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')

Expand Down Expand Up @@ -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)

0 comments on commit 688992c

Please sign in to comment.