fix: Recode line endings when installing

Close #168 for good, I hope.
freeciv · Jul 27, 2018 · b32cc5e · b32cc5e
1 parent 2c84ea9
commit b32cc5e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/scripts/install/install.sh b/scripts/install/install.sh
@@ -180,11 +180,10 @@ if [ ! -f "${basedir}"/scripts/configuration.sh ]; then
     echo >&2 "edit its content to suit your needs."
     exit 4
   fi
-else
-  # Remove \r, just in case the file comes from a Windows editor that doesn't
-  # respect line endings. See issue #168
-  sed -i 's/\r$//' "${basedir}"/scripts/configuration.sh
 fi
+# Remove \r, just in case the file comes from a Windows editor that doesn't
+# respect line endings, or from a transformed .dist. See issue #168
+sed -i 's/\r$//' "${basedir}"/scripts/configuration.sh
 
 if [ ! -f "${basedir}"/freeciv-web/src/main/webapp/WEB-INF/config.properties ]; then
   if [ "${FCW_INSTALL_MODE}" = TEST ]; then
@@ -196,11 +195,10 @@ if [ ! -f "${basedir}"/freeciv-web/src/main/webapp/WEB-INF/config.properties ];
     echo >&2 "suit your needs."
     exit 4
   fi
-else
-  # Remove \r, just in case the file comes from a Windows editor that doesn't
-  # respect line endings. See issue #168
-  sed -i 's/\r$//' "${basedir}"/freeciv-web/src/main/webapp/WEB-INF/config.properties
 fi
+# Remove \r, just in case the file comes from a Windows editor that doesn't
+# respect line endings, or from a transformed .dist. See issue #168
+sed -i 's/\r$//' "${basedir}"/freeciv-web/src/main/webapp/WEB-INF/config.properties
 
 FCW_INSTALL_SCRIPT=
 while IFS=$'\t\r' read -r v r s; do