Fix retard-os line endings.

Fixes issue 4093

Change-Id: I2174856d027fc280075c6d873d163fd2ae8bf00f
Reviewed-on: http://gerrit.dmdirc.com/1206
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

build-functions.sh

@@ -1,26 +1,26 @@
-#!/bin/bash
-# Provides functions that are used in multiple scripts in the build process
-
-function safe_mktemp {
-	if [ -x "`which mktemp`" ] ; then
-		TMPDIR=`mktemp -d`
-	else
-		if [ -d "$TMP" ] ; then
-			# We're running under Windows then use the global TMP location
-			TMPDIR="$TMP/$1-`date +%s`-$$-$RANDOM"
-		else
-			TMPDIR="`pwd`/build/temp/$1-$$-$RANDOM"
-		fi
-		# this is fragile
-		if [ -d "$TMPDIR" ] ; then
-			echo "no suitable temp folder found"
-			exit 2
-		fi
-		mkdir -p "$TMPDIR"  
-		if [ ! -d "$TMPDIR" ] ; then
-			echo "no suitable temp folder found"
-			exit 2
-		fi
-	fi
-	echo $TMPDIR
+#!/bin/bash
+# Provides functions that are used in multiple scripts in the build process
+
+function safe_mktemp {
+	if [ -x "`which mktemp`" ] ; then
+		TMPDIR=`mktemp -d`
+	else
+		if [ -d "$TMP" ] ; then
+			# We're running under Windows then use the global TMP location
+			TMPDIR="$TMP/$1-`date +%s`-$$-$RANDOM"
+		else
+			TMPDIR="`pwd`/build/temp/$1-$$-$RANDOM"
+		fi
+		# this is fragile
+		if [ -d "$TMPDIR" ] ; then
+			echo "no suitable temp folder found"
+			exit 2
+		fi
+		mkdir -p "$TMPDIR"  
+		if [ ! -d "$TMPDIR" ] ; then
+			echo "no suitable temp folder found"
+			exit 2
+		fi
+	fi
+	echo $TMPDIR
 }

build-installer.xml

@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc-installer" default="default" basedir=".">
-    <description>Tasks to build the DMDirc installer.</description>
-
-    <target name="installer"
-            description="Build the installer.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="this"/>
-        </exec>
-
-        <condition property="installer.success">
-            <equals arg1="${installer.result}" arg2="0" />
-        </condition>
-
-        <echo message="Installer build finished."/>
-        <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
-        <echo message=""/>
-    </target>
-
-    <target name="installer-stable"
-            description="Build the installer for a stable release.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="-t"/>
-            <arg value="-c"/>
-            <arg value="STABLE"/>
-            <arg value="--upload"/>
-        </exec>
-
-        <condition property="installer.success">
-            <equals arg1="${installer.result}" arg2="0" />
-        </condition>
-
-        <echo message="Installer build finished."/>
-        <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
-        <echo message=""/>
-    </target>
-
-    <target name="installer-unstable"
-            description="Build the installer for an unstable release.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="-t"/>
-            <arg value="-c"/>
-            <arg value="UNSTABLE"/>
-        </exec>
-
-        <condition property="installer.success">
-            <equals arg1="${installer.result}" arg2="0" />
-        </condition>
-
-        <echo message="Installer build finished."/>
-        <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
-        <echo message=""/>
-    </target>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-installer" default="default" basedir=".">
+    <description>Tasks to build the DMDirc installer.</description>
+
+    <target name="installer"
+            description="Build the installer.">
+        <exec executable="bash" dir="installer" resultproperty="installer.result">
+            <arg value="release.sh"/>
+            <arg value="this"/>
+        </exec>
+
+        <condition property="installer.success">
+            <equals arg1="${installer.result}" arg2="0" />
+        </condition>
+
+        <echo message="Installer build finished."/>
+        <echo message="Completed build files can be found in:"/>
+        <echo message="    ${installer.output.dir}"/>
+        <echo message=""/>
+    </target>
+
+    <target name="installer-stable"
+            description="Build the installer for a stable release.">
+        <exec executable="bash" dir="installer" resultproperty="installer.result">
+            <arg value="release.sh"/>
+            <arg value="-t"/>
+            <arg value="-c"/>
+            <arg value="STABLE"/>
+            <arg value="--upload"/>
+        </exec>
+
+        <condition property="installer.success">
+            <equals arg1="${installer.result}" arg2="0" />
+        </condition>
+
+        <echo message="Installer build finished."/>
+        <echo message="Completed build files can be found in:"/>
+        <echo message="    ${installer.output.dir}"/>
+        <echo message=""/>
+    </target>
+
+    <target name="installer-unstable"
+            description="Build the installer for an unstable release.">
+        <exec executable="bash" dir="installer" resultproperty="installer.result">
+            <arg value="release.sh"/>
+            <arg value="-t"/>
+            <arg value="-c"/>
+            <arg value="UNSTABLE"/>
+        </exec>
+
+        <condition property="installer.success">
+            <equals arg1="${installer.result}" arg2="0" />
+        </condition>
+
+        <echo message="Installer build finished."/>
+        <echo message="Completed build files can be found in:"/>
+        <echo message="    ${installer.output.dir}"/>
+        <echo message=""/>
+    </target>
+
+
+</project>

build-plugins.xml

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc-plugins" default="default" basedir=".">
-
-    <!-- Netbeans property files -->
-    <property file="nbproject/project.properties"/>
-    <property file="nbproject/private/private.properties"/>
-    <property file="${user.properties.file}"/>
-    
-    <target name="build-plugins" description="Build all plugins">
-        <exec executable="bash">
-            <arg value="createAllPluginJar.sh"/>
-            <arg value="${src.dir}/com/dmdirc/addons/"/>
-        </exec>
-    </target>
-
-    <target name="-update-bundled-plugins">
-       <exec executable="bash">
-            <arg value="updateBundledPlugins.sh"/>
-            <arg value="${dist.jar}"/>
-       </exec>
-    </target>
-    
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-plugins" default="default" basedir=".">
+
+    <!-- Netbeans property files -->
+    <property file="nbproject/project.properties"/>
+    <property file="nbproject/private/private.properties"/>
+    <property file="${user.properties.file}"/>
+    
+    <target name="build-plugins" description="Build all plugins">
+        <exec executable="bash">
+            <arg value="createAllPluginJar.sh"/>
+            <arg value="${src.dir}/com/dmdirc/addons/"/>
+        </exec>
+    </target>
+
+    <target name="-update-bundled-plugins">
+       <exec executable="bash">
+            <arg value="updateBundledPlugins.sh"/>
+            <arg value="${dist.jar}"/>
+       </exec>
+    </target>
+    
+</project>

build.xml

@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="DMDirc" default="default" basedir=".">
-    <description>Builds, tests, and runs the project DMDirc.</description>
-
-    <import file="nbproject/build-impl.xml"/>
-    <import file="build-installer.xml"/>
-    <import file="build-jar.xml"/>
-    <import file="build-plugins.xml"/>
-    <import file="build-reports.xml"/>
-    <import file="build-tests.xml"/>
-    <import file="build-versioning.xml"/>
-
-    <target name="-submodules" if="submodule.update">
-        <exec executable="bash">
-            <arg value="updateSubModules.sh"/>
-        </exec>
-    </target>
-
-    <target name="-pre-init" depends="-submodules"/>
-    <target name="-post-compile" depends="-write-version, build-plugins, -addpluginlibs"/>
-    <target name="-post-test-run" depends="-do-test-reports"/>
-    <target name="-post-jar" depends="-addjarlibs,-update-bundled-plugins"/>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc" default="default" basedir=".">
+    <description>Builds, tests, and runs the project DMDirc.</description>
+
+    <import file="nbproject/build-impl.xml"/>
+    <import file="build-installer.xml"/>
+    <import file="build-jar.xml"/>
+    <import file="build-plugins.xml"/>
+    <import file="build-reports.xml"/>
+    <import file="build-tests.xml"/>
+    <import file="build-versioning.xml"/>
+
+    <target name="-submodules" if="submodule.update">
+        <exec executable="bash">
+            <arg value="updateSubModules.sh"/>
+        </exec>
+    </target>
+
+    <target name="-pre-init" depends="-submodules"/>
+    <target name="-post-compile" depends="-write-version, build-plugins, -addpluginlibs"/>
+    <target name="-post-test-run" depends="-do-test-reports"/>
+    <target name="-post-jar" depends="-addjarlibs,-update-bundled-plugins"/>
+
+</project>

createPluginJar.sh

@@ -1,109 +1,109 @@
-#!/bin/bash
-# This script will create a plugin jar file for a given plugin.
-
-. build-functions.sh
-
-VALID_EXTS="class,png,exe,dll,html,css,js,gif,py"
-
-if [ "${1}" = "" -o "${2}" = "" ]; then
-	echo "Usage Example: ${0} com.dmdirc.addons.windowstatus WindowStatusPlugin"
-	echo "The above would create WindowStatusPlugin.jar in the plugins/ folder of the current dir"
-	exit;
-fi
-
-destdir=${PWD}
-srcdir=${PWD}/modules/plugins/
-pluginname=${1}
-foldername=${pluginname//.//}
-
-if [ "${REBUILDPLUGINS}" != "true" ]; then
-	newer=`find ${srcdir}/src/${foldername} -type f -newer ${destdir}/plugins/${2}.jar 2>&1 | wc -l`
-	
-	if [ $newer -eq 0 ]; then
-		echo "${2}.jar appears to be up-to-date";
-		exit 0;
-	fi
-fi;
-
-echo "Creating ${2}.jar for ${pluginname} (${foldername})"
-
-if [ ! -e modules/plugins/src/${foldername}/plugin.config ]; then
-	echo "no plugin.config found";
-	exit 0;
-fi
-
-#echo "looking for classes"
-TMPDIR=`safe_mktemp $foldername`
-#echo "Using temp dir: ${TMPDIR}"
-cd $TMPDIR
-
-mkdir META-INF
-if [ -e "${srcdir}/src/${foldername}/plugin.config" ]; then
-	cp "${srcdir}/src/${foldername}/plugin.config" META-INF/
-fi;
-
-if [ -d "${srcdir}/src/${foldername}/licences/" ]; then
-	cp -r "${srcdir}/src/${foldername}/licences/" META-INF/licences/
-fi;
-
-if [ -d "${srcdir}/src/${foldername}/identities/" ]; then
-        cp -r "${srcdir}/src/${foldername}/identities/" META-INF/identities/
-fi;
-
-
-# Do the same for plugin.config
-# This is rudimentary, it a version: section already exists (eg to specify
-# friendlyversion) then it won't add the number= key.
-if [ -e META-INF/plugin.config ]; then
-	VERSIONLINE=`grep -n "version:$" META-INF/plugin.config | cut -f 1 -d ':'`
-
-	if [ -z "$VERSIONLINE" ]; then
-		sed 's/keysections:/keysections:\n  version/g' META-INF/plugin.config > META-INF/plugin.config.temp
-		rm -Rf META-INF/plugin.config
-		mv META-INF/plugin.config.temp META-INF/plugin.config		
-	fi;
-
-	GIT=`which git`
-	REV=$(${GIT} --git-dir "${srcdir}/.git" describe --tags `${GIT} --git-dir "${srcdir}/.git" rev-list --max-count=1 HEAD -- "src/${foldername}"`);
-
-	echo "" >> META-INF/plugin.config
-	echo "" >> META-INF/plugin.config
-	echo "version:" >> META-INF/plugin.config;
-	echo "  number=$REV" >> META-INF/plugin.config;
-fi;
-
-foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`
-mkdir -p "$foo"
-cd "${foo}"
-ln -s "${destdir}/build/classes/${foldername}" .
-cd "$TMPDIR"
-mkdir -p "${destdir}/plugins/"
-
-rm -Rf "${destdir}/plugins/${2}.jar"
-jar -cvf "${srcdir}/src/${foldername}/${2}.jar" META-INF >/dev/null
-bit=""
-while [ 1 -eq 1 ]; do
-	bit=${bit}/*
-	ls ${foo}${bit}/* >/dev/null 2>&1
-	if [ ${?} -ne 0 ]; then
-		break;
-	else
-		DIR="${PWD}"
-		for prepackage in `ls "${srcdir}/src/${foldername}${bit}/prePackage.sh" 2>/dev/null`; do
-			cd `dirname "${prepackage}"`
-			/bin/sh "${prepackage}"
-			cd ${DIR}
-		done;
-
-		FILES="ls -1 "${foo}${bit}/"*.{${VALID_EXTS}}"
-                FILES=`eval ${FILES} 2>/dev/null`
-
-		jar -uvf "${srcdir}/src/${foldername}/${2}.jar" ${FILES} >/dev/null
-	fi
-done
-
-mv "${srcdir}/src/${foldername}/${2}.jar" "${destdir}/plugins/"
-
-cd "${srcdir}"
-rm -Rf ${TMPDIR}
-#echo "done";
+#!/bin/bash
+# This script will create a plugin jar file for a given plugin.
+
+. build-functions.sh
+
+VALID_EXTS="class,png,exe,dll,html,css,js,gif,py"
+
+if [ "${1}" = "" -o "${2}" = "" ]; then
+	echo "Usage Example: ${0} com.dmdirc.addons.windowstatus WindowStatusPlugin"
+	echo "The above would create WindowStatusPlugin.jar in the plugins/ folder of the current dir"
+	exit;
+fi
+
+destdir=${PWD}
+srcdir=${PWD}/modules/plugins/
+pluginname=${1}
+foldername=${pluginname//.//}
+
+if [ "${REBUILDPLUGINS}" != "true" ]; then
+	newer=`find ${srcdir}/src/${foldername} -type f -newer ${destdir}/plugins/${2}.jar 2>&1 | wc -l`
+	
+	if [ $newer -eq 0 ]; then
+		echo "${2}.jar appears to be up-to-date";
+		exit 0;
+	fi
+fi;
+
+echo "Creating ${2}.jar for ${pluginname} (${foldername})"
+
+if [ ! -e modules/plugins/src/${foldername}/plugin.config ]; then
+	echo "no plugin.config found";
+	exit 0;
+fi
+
+#echo "looking for classes"
+TMPDIR=`safe_mktemp $foldername`
+#echo "Using temp dir: ${TMPDIR}"
+cd $TMPDIR
+
+mkdir META-INF
+if [ -e "${srcdir}/src/${foldername}/plugin.config" ]; then
+	cp "${srcdir}/src/${foldername}/plugin.config" META-INF/
+fi;
+
+if [ -d "${srcdir}/src/${foldername}/licences/" ]; then
+	cp -r "${srcdir}/src/${foldername}/licences/" META-INF/licences/
+fi;
+
+if [ -d "${srcdir}/src/${foldername}/identities/" ]; then
+        cp -r "${srcdir}/src/${foldername}/identities/" META-INF/identities/
+fi;
+
+
+# Do the same for plugin.config
+# This is rudimentary, it a version: section already exists (eg to specify
+# friendlyversion) then it won't add the number= key.
+if [ -e META-INF/plugin.config ]; then
+	VERSIONLINE=`grep -n "version:$" META-INF/plugin.config | cut -f 1 -d ':'`
+
+	if [ -z "$VERSIONLINE" ]; then
+		sed 's/keysections:/keysections:\n  version/g' META-INF/plugin.config > META-INF/plugin.config.temp
+		rm -Rf META-INF/plugin.config
+		mv META-INF/plugin.config.temp META-INF/plugin.config		
+	fi;
+
+	GIT=`which git`
+	REV=$(${GIT} --git-dir "${srcdir}/.git" describe --tags `${GIT} --git-dir "${srcdir}/.git" rev-list --max-count=1 HEAD -- "src/${foldername}"`);
+
+	echo "" >> META-INF/plugin.config
+	echo "" >> META-INF/plugin.config
+	echo "version:" >> META-INF/plugin.config;
+	echo "  number=$REV" >> META-INF/plugin.config;
+fi;
+
+foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`
+mkdir -p "$foo"
+cd "${foo}"
+ln -s "${destdir}/build/classes/${foldername}" .
+cd "$TMPDIR"
+mkdir -p "${destdir}/plugins/"
+
+rm -Rf "${destdir}/plugins/${2}.jar"
+jar -cvf "${srcdir}/src/${foldername}/${2}.jar" META-INF >/dev/null
+bit=""
+while [ 1 -eq 1 ]; do
+	bit=${bit}/*
+	ls ${foo}${bit}/* >/dev/null 2>&1
+	if [ ${?} -ne 0 ]; then
+		break;
+	else
+		DIR="${PWD}"
+		for prepackage in `ls "${srcdir}/src/${foldername}${bit}/prePackage.sh" 2>/dev/null`; do
+			cd `dirname "${prepackage}"`
+			/bin/sh "${prepackage}"
+			cd ${DIR}
+		done;
+
+		FILES="ls -1 "${foo}${bit}/"*.{${VALID_EXTS}}"
+                FILES=`eval ${FILES} 2>/dev/null`
+
+		jar -uvf "${srcdir}/src/${foldername}/${2}.jar" ${FILES} >/dev/null
+	fi
+done
+
+mv "${srcdir}/src/${foldername}/${2}.jar" "${destdir}/plugins/"
+
+cd "${srcdir}"
+rm -Rf ${TMPDIR}
+#echo "done";

updateBundledPlugins.sh

@@ -1,59 +1,59 @@
-#!/bin/bash
-# updateBundledPlugins.sh <jar>
-# 
-# Reads the version of each bundled plugin in the specified jar, and writes
-# the names and versions to the jar's version.config file.
-
-. build-functions.sh
-
-jar=$1
-dir=`safe_mktemp $jar`
-config="$dir/com/dmdirc/version.config"
-jar="`pwd`/$jar"
-
-cd $dir
-# Read the jar's version.config out
-jar -xf $jar
-
-# Check for previous data
-startOffset=`grep -n "Begin updateBundledPlugins.sh" $config | head -n 1 | cut -f 1 -d ':'`
-endOffset=`grep -n "End updateBundledPlugins.sh" $config | tail -n 1 | cut -f 1 -d ':'`
-
-if [ -n "$startOffset" -a -n "$endOffset" ]; then
- # Previous data found, let's get rid of it
-
- head -n $(($startOffset-2)) $config >> $config.tmp;
- tail -n +$(($endOffset+1)) $config >> $config.tmp;
-
- mv $config.tmp $config;
-fi;
-
-# Add our new sections
-echo "" >> $config;
-echo "# --- Begin updateBundledPlugins.sh (`date`) --- " >> $config
-echo "keysections:" >> $config;
-echo "    bundledplugins_versions" >> $config;
-echo "" >> $config;
-echo "bundledplugins_versions:" >> $config;
-
-# For each plugin in the jar...
-for plugin in `ls plugins/* | cut -f 2 -d '/'`; do
- pluginName=${plugin%.jar}
-
- # Extract it to our temporary dir (can't extract zip files from stdin)
- jar -xf plugins/$plugin;
- # Read the plugin.config file and parse out the version number
- version=`cat META-INF/plugin.config | grep -1 version: | grep number= | cut -f 2 -d '='`;
-
- # And add the version to our version.config
- echo "    $pluginName=$version" >> $config;
-done;
-
-echo "# --- End updateBundledPlugins.sh --- " >> $config;
-
-# Update the version in the jar
-jar uf $jar -C $dir com/dmdirc/version.config;
-
-# Remove the temporary directory
-cd ..
-rm -rf $dir;
+#!/bin/bash
+# updateBundledPlugins.sh <jar>
+# 
+# Reads the version of each bundled plugin in the specified jar, and writes
+# the names and versions to the jar's version.config file.
+
+. build-functions.sh
+
+jar=$1
+dir=`safe_mktemp $jar`
+config="$dir/com/dmdirc/version.config"
+jar="`pwd`/$jar"
+
+cd $dir
+# Read the jar's version.config out
+jar -xf $jar
+
+# Check for previous data
+startOffset=`grep -n "Begin updateBundledPlugins.sh" $config | head -n 1 | cut -f 1 -d ':'`
+endOffset=`grep -n "End updateBundledPlugins.sh" $config | tail -n 1 | cut -f 1 -d ':'`
+
+if [ -n "$startOffset" -a -n "$endOffset" ]; then
+ # Previous data found, let's get rid of it
+
+ head -n $(($startOffset-2)) $config >> $config.tmp;
+ tail -n +$(($endOffset+1)) $config >> $config.tmp;
+
+ mv $config.tmp $config;
+fi;
+
+# Add our new sections
+echo "" >> $config;
+echo "# --- Begin updateBundledPlugins.sh (`date`) --- " >> $config
+echo "keysections:" >> $config;
+echo "    bundledplugins_versions" >> $config;
+echo "" >> $config;
+echo "bundledplugins_versions:" >> $config;
+
+# For each plugin in the jar...
+for plugin in `ls plugins/* | cut -f 2 -d '/'`; do
+ pluginName=${plugin%.jar}
+
+ # Extract it to our temporary dir (can't extract zip files from stdin)
+ jar -xf plugins/$plugin;
+ # Read the plugin.config file and parse out the version number
+ version=`cat META-INF/plugin.config | grep -1 version: | grep number= | cut -f 2 -d '='`;
+
+ # And add the version to our version.config
+ echo "    $pluginName=$version" >> $config;
+done;
+
+echo "# --- End updateBundledPlugins.sh --- " >> $config;
+
+# Update the version in the jar
+jar uf $jar -C $dir com/dmdirc/version.config;
+
+# Remove the temporary directory
+cd ..
+rm -rf $dir;