details: https://code.openbravo.com/erp/devel/pi/rev/1cfa227f1b1e changeset: 29568:1cfa227f1b1e user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Wed Jun 01 18:12:18 2016 +0200 summary: [JSBeautifier] Fix: Use files instead of mercurial changes
details: https://code.openbravo.com/erp/devel/pi/rev/35da6d3b9abc changeset: 29569:35da6d3b9abc user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Wed Jun 01 18:14:41 2016 +0200 summary: [JSBeautifier] Fix end file new line - Remove always last line of beautified file because the python always adds a line at the end - Remove -Z to take into account white spaces at line end diffstat: modules/org.openbravo.client.kernel/jsbeautify/jsbeautify | 4 ++-- modules/org.openbravo.client.kernel/jsbeautify/jsbeautify-module | 4 ++-- modules/org.openbravo.client.kernel/jsbeautify/jscheck-btfy-module | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diffs (40 lines): diff -r ab794c23a556 -r 35da6d3b9abc modules/org.openbravo.client.kernel/jsbeautify/jsbeautify --- a/modules/org.openbravo.client.kernel/jsbeautify/jsbeautify Wed Jun 01 09:24:38 2016 +0200 +++ b/modules/org.openbravo.client.kernel/jsbeautify/jsbeautify Wed Jun 01 18:14:41 2016 +0200 @@ -21,8 +21,8 @@ changedfile=$1 replaceparam=$2 -./modules/org.openbravo.client.kernel/jsbeautify/jsbeautifier.py --indent-size=2 --jslint-happy "$changedfile" > "$changedfile.beautified" -if ! diff -Z "$changedfile" "$changedfile.beautified" >/dev/null ; then +./modules/org.openbravo.client.kernel/jsbeautify/jsbeautifier.py --indent-size=2 --jslint-happy "$changedfile" | perl -pe 'chop if eof' > "$changedfile.beautified" +if ! diff "$changedfile" "$changedfile.beautified" >/dev/null ; then if [ "$replaceparam" != "replace" ] ; then echo "Beautify Error --> Please, beautify $changedfile"; rm -rf "$changedfile.beautified" diff -r ab794c23a556 -r 35da6d3b9abc modules/org.openbravo.client.kernel/jsbeautify/jsbeautify-module --- a/modules/org.openbravo.client.kernel/jsbeautify/jsbeautify-module Wed Jun 01 09:24:38 2016 +0200 +++ b/modules/org.openbravo.client.kernel/jsbeautify/jsbeautify-module Wed Jun 01 18:14:41 2016 +0200 @@ -21,8 +21,8 @@ changedfile=$1 replaceparam=$2 -../org.openbravo.client.kernel/jsbeautify/jsbeautifier.py --indent-size=2 --jslint-happy "$changedfile" > "$changedfile.beautified" -if ! diff -Z "$changedfile" "$changedfile.beautified" >/dev/null ; then +../org.openbravo.client.kernel/jsbeautify/jsbeautifier.py --indent-size=2 --jslint-happy "$changedfile" | perl -pe 'chop if eof' > "$changedfile.beautified" +if ! diff "$changedfile" "$changedfile.beautified" >/dev/null ; then if [ "$replaceparam" != "replace" ] ; then echo "Beautify Error --> Please, beautify $changedfile"; rm -rf "$changedfile.beautified" diff -r ab794c23a556 -r 35da6d3b9abc modules/org.openbravo.client.kernel/jsbeautify/jscheck-btfy-module --- a/modules/org.openbravo.client.kernel/jsbeautify/jscheck-btfy-module Wed Jun 01 09:24:38 2016 +0200 +++ b/modules/org.openbravo.client.kernel/jsbeautify/jscheck-btfy-module Wed Jun 01 18:14:41 2016 +0200 @@ -26,7 +26,7 @@ files=$(../org.openbravo.client.kernel/jscheck/jsfiles ./) -for changedfile in echo $(hg st -ma) +for changedfile in echo $files; do if [ -f "$changedfile" -a -n "$(echo $changedfile | awk '/.js$/')" ]; then source ../org.openbravo.client.kernel/jsbeautify/jsbeautify-module $changedfile $replaceparam ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
