From 2f41b9e4418def9b69cf237312bc592364585025 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 7 Aug 2018 16:47:47 +0200
Subject: [PATCH] Moved deploy.sh to bin folder

---
 .gitlab-ci.yml             | 6 +++---
 README.md                  | 7 ++++---
 deploy.sh => bin/deploy.sh | 0
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename deploy.sh => bin/deploy.sh (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8018543b..250bf0db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ test:7.1:
 
   # Install project and dependencies
   - &deployment_dependencies |-
-    chmod +x ./deploy.sh
+    chmod +x ./bin/deploy.sh
     apt update && apt install -yqq rsync openssh-client
     /usr/local/bin/composer --no-ansi install --no-dev
     /usr/local/bin/composer --no-ansi dump-autoload --optimize
@@ -95,7 +95,7 @@ deploy_staging:
     - *deployment_ssh
     - *deployment_dependencies
     # Deploy to server
-    - ./deploy.sh -r "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
+    - ./bin/deploy.sh -r "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
 
 deploy_production:
   <<: *deploy_definition
@@ -112,4 +112,4 @@ deploy_production:
     - *deployment_ssh
     - *deployment_dependencies
     # Deploy to server
-    - ./deploy.sh -r "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
+    - ./bin/deploy.sh -r "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
diff --git a/README.md b/README.md
index 662d994c..d56603a5 100644
--- a/README.md
+++ b/README.md
@@ -73,10 +73,11 @@ PRODUCTION_REMOTE       # Same as STAGING_REMOTE but for the production environm
 PRODUCTION_REMOTE_PATH  # Same as STAGING_REMOTE_PATH but for the production environment
 ```
 
-#### deploy.sh
-The `deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh.
+#### Scripts
+##### bin/deploy.sh
+The `bin/deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh.
 
-For usage see `./deploy.sh -h`
+For usage see `./bin/deploy.sh -h`
 
 ### Codestyle
 Please ensure that your pull requests follow [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/).
diff --git a/deploy.sh b/bin/deploy.sh
similarity index 100%
rename from deploy.sh
rename to bin/deploy.sh