Try to mitigate newline

This commit is contained in:
Thomas Suckow
2021-01-16 16:38:12 -08:00
parent 5e8db0cead
commit aad89b9bda
3 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -1,3 +1,3 @@
*.sh text eol=lf
#The #! won't work if CRLF
/Installer/debian/docker/debian/rules text eol=lf
#The #! in rules won't work if CRLF
/Installer/debian/docker/debian/* text eol=lf
+2 -1
View File
@@ -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
+2
View File
@@ -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