From aad89b9bdada66b8e5f04c4d050345bbd35ced40 Mon Sep 17 00:00:00 2001
From: Thomas Suckow <tsuckow@gmail.com>
Date: Sat, 16 Jan 2021 16:38:12 -0800
Subject: [PATCH] Try to mitigate newline

---
 .gitattributes                    | 4 ++--
 Installer/debian/build.sh         | 3 ++-
 Installer/debian/docker/runner.sh | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 55e883fc9..2c6923dd0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 *.sh text eol=lf
-#The #! won't work if CRLF
-/Installer/debian/docker/debian/rules text eol=lf
\ No newline at end of file
+#The #! in rules won't work if CRLF
+/Installer/debian/docker/debian/* text eol=lf
\ No newline at end of file
diff --git a/Installer/debian/build.sh b/Installer/debian/build.sh
index a7a782c7b..46ddc3ba0 100755
--- a/Installer/debian/build.sh
+++ b/Installer/debian/build.sh
@@ -5,7 +5,8 @@ SCRIPTDIR=$( cd "$(dirname "$0")" ; pwd -P )
 
 docker build $SCRIPTDIR/docker -t duplicati-debian
 
-export VERSION=`grep '<Version>' < $SCRIPTDIR/../../Duplicati/Server/Duplicati.Server.csproj | sed 's/.*<Version>\(.*\)<\/Version>/\1/'`
+VERSION=`grep '<Version>' < $SCRIPTDIR/../../Duplicati/Server/Duplicati.Server.csproj | sed 's/.*<Version>\(.*\)<\/Version>/\1/'`
+VERSION=${VERSION//$'\n'}
 echo Building version: $VERSION
 
 export MSYS_NO_PATHCONV=1
diff --git a/Installer/debian/docker/runner.sh b/Installer/debian/docker/runner.sh
index 2a677a352..e817442bf 100755
--- a/Installer/debian/docker/runner.sh
+++ b/Installer/debian/docker/runner.sh
@@ -3,6 +3,8 @@ cd /deb
 DATE_STAMP=$(LANG=C date -R)
 sed -e "s;%VERSION%;$VERSION;g" -e "s;%DATE%;$DATE_STAMP;g" -i "debian/changelog"
 
+cat debian/changelog
+
 cp /sources/changelog.txt ./
 
 dpkg-buildpackage -b --no-sign