From 40b2c1215aeddf3f964eb0baf9ec982ade3ee57e Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 11 Sep 2014 15:33:13 +0200 Subject: [PATCH] CR/LF to LF in script files --- BuildFiles/Packaging/repackage | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BuildFiles/Packaging/repackage b/BuildFiles/Packaging/repackage index 2c887b97..9278a1ab 100755 --- a/BuildFiles/Packaging/repackage +++ b/BuildFiles/Packaging/repackage @@ -86,7 +86,7 @@ if [ "$COPYFILES" == "yes" ]; then fi if [ "$1" == "frontend" ]; then - echo "moving user-configurable files to /etc/swarmops/..." + echo "Moving user-configurable files to /etc/swarmops/..." mkdir -p etc/swarmops mv $DEPLOYDIR/$TARGETDIR/machineKey.config etc/swarmops/. sed -i 's/\"machineKey.config\"/\"..\/..\/..\/..\/etc\/swarmops\/machineKey.config\"/g' $DEPLOYDIR/$TARGETDIR/web.config @@ -123,6 +123,10 @@ else fi fi +echo "Converting possible CRLF line endings in scripts to LF-only..." +dos2unix DEBIAN/* +dos2unix etc/init.d/* + echo "Setting build number ($(cat ../$BUILDIDSOURCE | tr -d ' \r'))..." sed -i "s/--BuildNumber--/$(cat ../$BUILDIDSOURCE | tr -d ' \r')/" DEBIAN/control