aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2019-05-26 13:37:00 -0300
committerEuAndreh <eu@euandre.org>2019-05-26 13:52:56 -0300
commit60dab6efb5b15e70d514b8aead84eb70c3af3dfb (patch)
treed393e830cd2c62edd046368e2fc26b8d6b1d9dd1
parentFix unexpected shell scaping (diff)
downloadtoph-60dab6efb5b15e70d514b8aead84eb70c3af3dfb.tar.gz
toph-60dab6efb5b15e70d514b8aead84eb70c3af3dfb.tar.xz
Remove extra newline at "Done.\n" messages
-rwxr-xr-xdeploy.sh6
-rw-r--r--provision.sh10
2 files changed, 8 insertions, 8 deletions
diff --git a/deploy.sh b/deploy.sh
index f96cfe5..75cd78f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -28,16 +28,16 @@ ssh "$TLD" sudo apt-get update
ssh "$TLD" sudo apt-get upgrade -y
ssh "$TLD" sudo apt-get install -y docker-compose
ssh "$TLD" sudo apt-get autoremove -y
-echo "Done.\n"
+echo "Done."
echo "Copy over files..."
ssh "$TLD" mkdir -p /home/vps/
envsubst < docker-compose.yaml > docker-compose.yaml.fd
scp docker-compose.yaml.fd "$TLD":/home/vps/docker-compose.yaml
rm docker-compose.yaml.fd
-echo "Done.\n"
+echo "Done."
echo "Restart docker-compose"
ssh "$TLD" "cd /home/vps/ && docker-compose pull"
ssh "$TLD" "cd /home/vps/ && docker-compose up -d"
-echo "Done.\n"
+echo "Done."
diff --git a/provision.sh b/provision.sh
index 7c2580e..70f3b59 100644
--- a/provision.sh
+++ b/provision.sh
@@ -8,17 +8,17 @@ pushd ../vps-state/
git crypt unlock
popd
source .envrc
-echo "Done.\n"
+echo "Done."
alias ssh="ssh -i secrets/id_rsa root@$TLD"
echo "Shutting down running containers..."
ssh "cd /home/vps/ && docker-compose down"
-echo "Done.\n"
+echo "Done."
echo "Running 'terraform apply'..."
terraform apply
-echo "Done.\n"
+echo "Done."
echo "Storing .tfstate file"
pushd ../vps-state/
@@ -26,11 +26,11 @@ git add secrets/terraform.tfstate secrets/terraform.tfstate.backup
git commit -m "CI: update Terraform .tfstate files"
git push origin master
popd
-echo "Done.\n"
+echo "Done."
echo "Locking git-crypt repositories back..."
git crypt lock
pushd ../vps-state/
git crypt lock
popd
-echo "Done.\n"
+echo "Done."