Commit 25e8324d authored by Aaron Wells's avatar Aaron Wells Committed by Robert Lyon

Bug 1622788: Composer step not needed for simplesamlphp

behatnotneeded: Covered by existing tests

Change-Id: I665a434470db4b2ecaf5db0f29b92380f49fe28c
parent 58abb86f
......@@ -41,7 +41,7 @@ composer := $(shell ls external/composer.phar 2>/dev/null)
installcomposer:
ifdef composer
@echo "Composer allready installed..."
@echo "Composer already installed..."
else
@echo "Installing Composer..."
@curl -sS https://getcomposer.org/installer | php -- --install-dir=external
......@@ -57,13 +57,19 @@ cleanssphp:
@echo "Cleaning out SimpleSAMLphp..."
rm -rf htdocs/auth/saml/extlib/simplesamlphp
ssphp: installcomposer
ssphp:
ifdef simplesamlphp
@echo "SimpleSAMLphp already exists - doing nothing"
else
@echo "Pulling SimpleSAMLphp from download ..."
@curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.14.7/simplesamlphp-1.14.7.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf -
@php external/composer.phar --working-dir=htdocs/auth/saml/extlib/simplesamlphp update
# SimpleSAMLPHP release tarball already has all composer dependencies.
# @php external/composer.phar --working-dir=htdocs/auth/saml/extlib/simplesamlphp update --no-dev
@echo "Deleting unneeded files ..."
# Delete composer.json and .lock files to avoid leaking minor version info
@find htdocs/auth/saml/extlib -type f -name composer.json -delete
@find htdocs/auth/saml/extlib -type f -name composer.lock -delete
@echo "Done!"
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment