You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/05/12 18:59:16 UTC
svn commit: r1795009 - in
/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components:
datatables-plugins/make.sh datatables-responsive/make.sh
morrisjs/spec/viz/run.sh
Author: fschumacher
Date: Fri May 12 18:59:15 2017
New Revision: 1795009
URL: http://svn.apache.org/viewvc?rev=1795009&view=rev
Log:
set native eol-style for shell files
Modified:
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh (props changed)
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (contents, props changed)
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh (props changed)
Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh?rev=1795009&r1=1795008&r2=1795009&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (original)
+++ jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh Fri May 12 18:59:15 2017
@@ -1,31 +1,31 @@
-#!/bin/sh
-
-OUT_DIR=$1
-DEBUG=$2
-
-# Change into script's own dir
-cd $(dirname $0)
-
-DT_SRC=$(dirname $(dirname $(pwd)))
-DT_BUILT="${DT_SRC}/built/DataTables"
-. $DT_SRC/build/include.sh
-
-# Copy CSS
-scss_compile css/dataTables.responsive.scss
-rsync -r css $OUT_DIR
-
-# Copy images
-#rsync -r images $OUT_DIR
-
-# Copy JS
-rsync -r js $OUT_DIR
-js_compress $OUT_DIR/js/dataTables.responsive.js
-
-# Copy and build examples
-rsync -r examples $OUT_DIR
-examples_process $OUT_DIR/examples
-
-# Readme and license
-cp Readme.md $OUT_DIR
-cp License.txt $OUT_DIR
-
+#!/bin/sh
+
+OUT_DIR=$1
+DEBUG=$2
+
+# Change into script's own dir
+cd $(dirname $0)
+
+DT_SRC=$(dirname $(dirname $(pwd)))
+DT_BUILT="${DT_SRC}/built/DataTables"
+. $DT_SRC/build/include.sh
+
+# Copy CSS
+scss_compile css/dataTables.responsive.scss
+rsync -r css $OUT_DIR
+
+# Copy images
+#rsync -r images $OUT_DIR
+
+# Copy JS
+rsync -r js $OUT_DIR
+js_compress $OUT_DIR/js/dataTables.responsive.js
+
+# Copy and build examples
+rsync -r examples $OUT_DIR
+examples_process $OUT_DIR/examples
+
+# Readme and license
+cp Readme.md $OUT_DIR
+cp License.txt $OUT_DIR
+
Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh
------------------------------------------------------------------------------
svn:eol-style = native
Re: svn commit: r1795009 - in
/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components:
datatables-plugins/make.sh datatables-responsive/make.sh
morrisjs/spec/viz/run.sh
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 14.05.2017 um 17:27 schrieb sebb:
> On 12 May 2017 at 19:59, <fs...@apache.org> wrote:
>> Author: fschumacher
>> Date: Fri May 12 18:59:15 2017
>> New Revision: 1795009
>>
>> URL: http://svn.apache.org/viewvc?rev=1795009&view=rev
>> Log:
>> set native eol-style for shell files
> Unix uses LF
>
> See for example jmeter.sh
I have changed the shell files to LF ending.
Thanks for pointing out.
>
>> Modified:
>> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh (props changed)
>> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (contents, props changed)
>> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh (props changed)
>>
>> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Modified: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
>> URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh?rev=1795009&r1=1795008&r2=1795009&view=diff
>> ==============================================================================
>> --- jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (original)
>> +++ jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh Fri May 12 18:59:15 2017
>> @@ -1,31 +1,31 @@
>> -#!/bin/sh
>> -
>> -OUT_DIR=$1
>> -DEBUG=$2
>> -
>> -# Change into script's own dir
>> -cd $(dirname $0)
>> -
>> -DT_SRC=$(dirname $(dirname $(pwd)))
>> -DT_BUILT="${DT_SRC}/built/DataTables"
>> -. $DT_SRC/build/include.sh
>> -
>> -# Copy CSS
>> -scss_compile css/dataTables.responsive.scss
>> -rsync -r css $OUT_DIR
>> -
>> -# Copy images
>> -#rsync -r images $OUT_DIR
>> -
>> -# Copy JS
>> -rsync -r js $OUT_DIR
>> -js_compress $OUT_DIR/js/dataTables.responsive.js
>> -
>> -# Copy and build examples
>> -rsync -r examples $OUT_DIR
>> -examples_process $OUT_DIR/examples
>> -
>> -# Readme and license
>> -cp Readme.md $OUT_DIR
>> -cp License.txt $OUT_DIR
>> -
>> +#!/bin/sh
>> +
>> +OUT_DIR=$1
>> +DEBUG=$2
>> +
>> +# Change into script's own dir
>> +cd $(dirname $0)
>> +
>> +DT_SRC=$(dirname $(dirname $(pwd)))
>> +DT_BUILT="${DT_SRC}/built/DataTables"
>> +. $DT_SRC/build/include.sh
>> +
>> +# Copy CSS
>> +scss_compile css/dataTables.responsive.scss
>> +rsync -r css $OUT_DIR
>> +
>> +# Copy images
>> +#rsync -r images $OUT_DIR
>> +
>> +# Copy JS
>> +rsync -r js $OUT_DIR
>> +js_compress $OUT_DIR/js/dataTables.responsive.js
>> +
>> +# Copy and build examples
>> +rsync -r examples $OUT_DIR
>> +examples_process $OUT_DIR/examples
>> +
>> +# Readme and license
>> +cp Readme.md $OUT_DIR
>> +cp License.txt $OUT_DIR
>> +
>>
>> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh
>> ------------------------------------------------------------------------------
>> svn:eol-style = native
>>
>>
Re: svn commit: r1795009 - in /jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components:
datatables-plugins/make.sh datatables-responsive/make.sh morrisjs/spec/viz/run.sh
Posted by sebb <se...@gmail.com>.
On 12 May 2017 at 19:59, <fs...@apache.org> wrote:
> Author: fschumacher
> Date: Fri May 12 18:59:15 2017
> New Revision: 1795009
>
> URL: http://svn.apache.org/viewvc?rev=1795009&view=rev
> Log:
> set native eol-style for shell files
Unix uses LF
See for example jmeter.sh
> Modified:
> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh (props changed)
> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (contents, props changed)
> jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh (props changed)
>
> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/make.sh
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
> URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh?rev=1795009&r1=1795008&r2=1795009&view=diff
> ==============================================================================
> --- jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh (original)
> +++ jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh Fri May 12 18:59:15 2017
> @@ -1,31 +1,31 @@
> -#!/bin/sh
> -
> -OUT_DIR=$1
> -DEBUG=$2
> -
> -# Change into script's own dir
> -cd $(dirname $0)
> -
> -DT_SRC=$(dirname $(dirname $(pwd)))
> -DT_BUILT="${DT_SRC}/built/DataTables"
> -. $DT_SRC/build/include.sh
> -
> -# Copy CSS
> -scss_compile css/dataTables.responsive.scss
> -rsync -r css $OUT_DIR
> -
> -# Copy images
> -#rsync -r images $OUT_DIR
> -
> -# Copy JS
> -rsync -r js $OUT_DIR
> -js_compress $OUT_DIR/js/dataTables.responsive.js
> -
> -# Copy and build examples
> -rsync -r examples $OUT_DIR
> -examples_process $OUT_DIR/examples
> -
> -# Readme and license
> -cp Readme.md $OUT_DIR
> -cp License.txt $OUT_DIR
> -
> +#!/bin/sh
> +
> +OUT_DIR=$1
> +DEBUG=$2
> +
> +# Change into script's own dir
> +cd $(dirname $0)
> +
> +DT_SRC=$(dirname $(dirname $(pwd)))
> +DT_BUILT="${DT_SRC}/built/DataTables"
> +. $DT_SRC/build/include.sh
> +
> +# Copy CSS
> +scss_compile css/dataTables.responsive.scss
> +rsync -r css $OUT_DIR
> +
> +# Copy images
> +#rsync -r images $OUT_DIR
> +
> +# Copy JS
> +rsync -r js $OUT_DIR
> +js_compress $OUT_DIR/js/dataTables.responsive.js
> +
> +# Copy and build examples
> +rsync -r examples $OUT_DIR
> +examples_process $OUT_DIR/examples
> +
> +# Readme and license
> +cp Readme.md $OUT_DIR
> +cp License.txt $OUT_DIR
> +
>
> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/make.sh
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/spec/viz/run.sh
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
>