From a0b66564cfb3bbe28c9a51dcbc253373cc2ec70d Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 6 Jul 2020 18:04:13 +0200
Subject: [PATCH] Improve script output and some help text Add quotes and empty
line to .gitlab-ci.yml
---
bin/prepareLocally.sh | 16 ++++++++++++----
src/Handler.php | 3 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/bin/prepareLocally.sh b/bin/prepareLocally.sh
index 480d928..2fe5d5d 100755
--- a/bin/prepareLocally.sh
+++ b/bin/prepareLocally.sh
@@ -3,11 +3,19 @@
COMPOSER=composer.spoons.json
export COMPOSER
-echo "Installing DrupalSpoons plugin"
+echo -e "\n\n\nInstalling DrupalSpoons plugin"
composer require --dev --no-interaction lakedrops/drupal-spoons:dev-master composer/installers:^1
-echo "Preparing $COMPOSER"
+echo -e "\n\n\nPreparing $COMPOSER"
composer drupalspoons:prepare
-echo "Configuring project for local tests"
+echo -e "\n\n\nConfiguring project for local tests"
composer drupalspoons:configure
-echo "Installing dependencies"
+echo -e "\n\n\nInstalling dependencies"
composer update --dev --no-interaction
+
+echo -e "\n\n\n===================================================="
+echo "Successfully installed DrupalSpoons for local usage!"
+echo -e "\n\nUsage:"
+echo " vendor/bin/spoon [script]"
+echo -e "\n\nwhere [script] should be replaced by one of the"
+echo "available scripts for testing."
+echo "===================================================="
diff --git a/src/Handler.php b/src/Handler.php
index 97b1be2..e6be6a5 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -205,8 +205,9 @@ class Handler {
return <<<gitlabci
include:
- project: 'drupalspoons/webmasters'
- ref: $version
+ ref: '$version'
file: 'templates/.gitlab-ci.yml'
+
gitlabci;
}
--
GitLab