From c7f829b822b161a02c099e8ade50e46bd0d36699 Mon Sep 17 00:00:00 2001
From: Rob Harrison <robwithhair@gmail.com>
Date: Fri, 28 Jun 2019 16:57:02 +0100
Subject: [PATCH] Installed bash to fix bug

---
 mysql-backup-s3/#backup.sh#   | 111 ----------------------------------
 mysql-backup-s3/.#backup.sh   |   1 -
 mysql-backup-s3/install.sh    |   1 +
 postgres-backup-s3/install.sh |   1 +
 4 files changed, 2 insertions(+), 112 deletions(-)
 delete mode 100644 mysql-backup-s3/#backup.sh#
 delete mode 120000 mysql-backup-s3/.#backup.sh

diff --git a/mysql-backup-s3/#backup.sh# b/mysql-backup-s3/#backup.sh#
deleted file mode 100644
index f5cf98d..0000000
--- a/mysql-backup-s3/#backup.sh#
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/bash
-
-set -e
-set -o pipefail
-
-if [ "${S3_ACCESS_KEY_ID}" == "**None**" ]; then
-  echo "Warning: You did not set the S3_ACCESS_KEY_ID environment variable."
-fi
-
-if [ "${S3_SECRET_ACCESS_KEY}" == "**None**" ]; then
-  echo "Warning: You did not set the S3_SECRET_ACCESS_KEY environment variable."
-fi
-
-if [ "${S3_BUCKET}" == "**None**" ]; then
-  echo "You need to set the S3_BUCKET environment variable."
-  exit 1
-fi
-
-if [ "${MYSQL_HOST}" == "**None**" ]; then
-  echo "You need to set the MYSQL_HOST environment variable."
-  exit 1
-fi
-
-if [ "${MYSQL_USER}" == "**None**" ]; then
-  echo "You need to set the MYSQL_USER environment variable."
-  exit 1
-fi
-
-if [ "${MYSQL_PASSWORD}" == "**None**" ]; then
-  echo "You need to set the MYSQL_PASSWORD environment variable or link to a container named MYSQL."
-  exit 1
-fi
-
-if [ "${S3_IAMROLE}" != "true" ]; then
-  # env vars needed for aws tools - only if an IAM role is not used
-  export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID
-  export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY
-  export AWS_DEFAULT_REGION=$S3_REGION
-fi
-
-MYSQL_HOST_OPTS="-h $MYSQL_HOST -P $MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD"
-DUMP_START_TIME=$(date +"%Y-%m-%dT%H%M%SZ")
-
-copy_s3 () {
-  SRC_FILE=$1
-  DEST_FILE=$2
-
-  if [ "${S3_ENDPOINT}" == "**None**" ]; then
-    AWS_ARGS=""
-  else
-    AWS_ARGS="--endpoint-url ${S3_ENDPOINT}"
-  fi
-
-  echo "Uploading ${DEST_FILE} on S3..."
-
-  cat $SRC_FILE | aws $AWS_ARGS s3 cp --storage-class STANDARD_IA - s3://$S3_BUCKET/$S3_PREFIX/$DEST_FILE
-
-  if [ $? != 0 ]; then
-    >&2 echo "Error uploading ${DEST_FILE} on S3"
-  fi
-
-  rm $SRC_FILE
-}
-# Multi file: yes
-if [ ! -z "$(echo $MULTI_FILES | grep -i -E "(yes|true|1)")" ]; then
-  if [ "${MYSQLDUMP_DATABASE}" == "--all-databases" ]; then
-    DATABASES=`mysql $MYSQL_HOST_OPTS -e "SHOW DATABASES;" | grep -Ev "(Database|information_schema|performance_schema|mysql|sys|innodb)"`
-  else
-    DATABASES=$MYSQLDUMP_DATABASE
-  fi
-
-  for DB in $DATABASES; do
-    echo "Creating individual dump of ${DB} from ${MYSQL_HOST}..."
-
-    DUMP_FILE="/tmp/${DB}.sql.gz"
-
-    mysqldump $MYSQL_HOST_OPTS $MYSQLDUMP_OPTIONS --databases $DB | gzip > $DUMP_FILE
-
-    if [ $? == 0 ]; then
-      if [ "${S3_FILENAME}" == "**None**" ]; then
-        S3_FILE="${DUMP_START_TIME}.${DB}.sql.gz"
-      else
-        S3_FILE="${S3_FILENAME}.${DB}.sql.gz"
-      fi
-
-      copy_s3 $DUMP_FILE $S3_FILE
-    else
-      >&2 echo "Error creating dump of ${DB}"
-    fi
-  done
-# Multi file: no
-else
-  echo "Creating dump for ${MYSQLDUMP_DATABASE} from ${MYSQL_HOST}..."
-
-  DUMP_FILE="/tmp/dump.sql.gz"
-  mysqldump $MYSQL_HOST_OPTS $MYSQLDUMP_OPTIONS $MYSQLDUMP_DATABASE | gzip > $DUMP_FILE
-
-  if [ $? == 0 ]; then
-    if [ "${S3_FILENAME}" == "**None**" ]; then
-      S3_FILE="${DUMP_START_TIME}.dump.sql.gz"
-    else
-      S3_FILE="${S3_FILENAME}.sql.gz"
-    fi
-
-    copy_s3 $DUMP_FILE $S3_FILE
-  else
-    >&2 echo "Error creating dump of all databases"
-  fi
-fi
-
-echo "SQL backup finished"
diff --git a/mysql-backup-s3/.#backup.sh b/mysql-backup-s3/.#backup.sh
deleted file mode 120000
index 43f9701..0000000
--- a/mysql-backup-s3/.#backup.sh
+++ /dev/null
@@ -1 +0,0 @@
-robwithhair@Robs-MacBook.local.98085
\ No newline at end of file
diff --git a/mysql-backup-s3/install.sh b/mysql-backup-s3/install.sh
index eda916a..232ca21 100644
--- a/mysql-backup-s3/install.sh
+++ b/mysql-backup-s3/install.sh
@@ -20,6 +20,7 @@ curl -L --insecure https://github.com/odise/go-cron/releases/download/v0.0.6/go-
 chmod u+x /usr/local/bin/go-cron
 apk del curl
 
+apk add bash
 
 # cleanup
 rm -rf /var/cache/apk/*
diff --git a/postgres-backup-s3/install.sh b/postgres-backup-s3/install.sh
index 16c7119..d818c5e 100644
--- a/postgres-backup-s3/install.sh
+++ b/postgres-backup-s3/install.sh
@@ -20,6 +20,7 @@ curl -L --insecure https://github.com/odise/go-cron/releases/download/v0.0.6/go-
 chmod u+x /usr/local/bin/go-cron
 apk del curl
 
+apk add bash
 
 # cleanup
 rm -rf /var/cache/apk/*