From b55fcf1f55840b00b9494ae67a3a81805140c889 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Thu, 8 Oct 2020 16:05:46 +0200 Subject: [PATCH] Don't wrap base64 output --- distillery/info.sh | 2 +- .../resources/compose/barrel/scripts/provision_container.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distillery/info.sh b/distillery/info.sh index b4bd6ee..086e46a 100755 --- a/distillery/info.sh +++ b/distillery/info.sh @@ -20,7 +20,7 @@ fi; # Read everything from the database read -r INSTANCE_BASE_DIR MYSQL_DATABASE MYSQL_USER GRAPHDB_REPO GRAPHDB_USER GRAPHDB_PASSWORD <<< "$(sql_bookkeep_load "${SLUG}" "filesystem_base,sql_database,sql_user,graphdb_repository,graphdb_user,graphdb_password" | tail -n +2)" -GRAPHDB_HEADER="$(echo "$GRAPHDB_USER:$GRAPHDB_PASSWORD" | base64)" +GRAPHDB_HEADER="$(echo "$GRAPHDB_USER:$GRAPHDB_PASSWORD" | base64 -w 0)" echo "==================================================================================" diff --git a/distillery/resources/compose/barrel/scripts/provision_container.sh b/distillery/resources/compose/barrel/scripts/provision_container.sh index d191779..48a00f6 100644 --- a/distillery/resources/compose/barrel/scripts/provision_container.sh +++ b/distillery/resources/compose/barrel/scripts/provision_container.sh @@ -32,7 +32,7 @@ GRAPHDB_PASSWORD="$3" echo "GRAPHDB_PASSWORD=$GRAPHDB_PASSWORD" shift 3 -GRAPHDB_HEADER="$(echo "$GRAPHDB_USER:$GRAPHDB_PASSWORD" | base64)" +GRAPHDB_HEADER="$(echo "$GRAPHDB_USER:$GRAPHDB_PASSWORD" | base64 -w 0)" DRUPAL_USER="$1" echo "DRUPAL_USER=$DRUPAL_USER"