retab and remove trailing whitespace
This commit is contained in:
@ -3,7 +3,7 @@
|
|||||||
# Copyright (C) 2010-2012, Robert Johansson and contributors, Raditex AB
|
# Copyright (C) 2010-2012, Robert Johansson and contributors, Raditex AB
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# rSCADA
|
# rSCADA
|
||||||
# http://www.rSCADA.se
|
# http://www.rSCADA.se
|
||||||
# info@rscada.se
|
# info@rscada.se
|
||||||
#
|
#
|
||||||
@ -33,27 +33,27 @@ if [ ! -d "$directory" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
for hexfile in "$directory"/*.hex; do
|
for hexfile in "$directory"/*.hex; do
|
||||||
if [ ! -f "$hexfile" ]; then
|
if [ ! -f "$hexfile" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
filename=`basename $hexfile .hex`
|
filename=`basename $hexfile .hex`
|
||||||
|
|
||||||
# Parse hex file and write XML in file
|
# Parse hex file and write XML in file
|
||||||
./mbus_parse_hex "$hexfile" > "$directory/$filename.xml.new"
|
./mbus_parse_hex "$hexfile" > "$directory/$filename.xml.new"
|
||||||
result=$?
|
result=$?
|
||||||
|
|
||||||
# Check parsing result
|
# Check parsing result
|
||||||
if [ $result -ne 0 ]; then
|
if [ $result -ne 0 ]; then
|
||||||
echo "Unable to generate XML for $hexfile"
|
echo "Unable to generate XML for $hexfile"
|
||||||
rm "$directory/$filename.xml.new"
|
rm "$directory/$filename.xml.new"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Compare old XML with new XML and write in file
|
# Compare old XML with new XML and write in file
|
||||||
diff -u "$directory/$filename.xml" "$directory/$filename.xml.new" 2> /dev/null > "$directory/$filename.dif"
|
diff -u "$directory/$filename.xml" "$directory/$filename.xml.new" 2> /dev/null > "$directory/$filename.dif"
|
||||||
result=$?
|
result=$?
|
||||||
|
|
||||||
case "$result" in
|
case "$result" in
|
||||||
0)
|
0)
|
||||||
# XML equal -> remove new
|
# XML equal -> remove new
|
||||||
@ -65,7 +65,7 @@ for hexfile in "$directory"/*.hex; do
|
|||||||
cat "$directory/$filename.dif" && rm "$directory/$filename.dif"
|
cat "$directory/$filename.dif" && rm "$directory/$filename.dif"
|
||||||
echo ""
|
echo ""
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# no old -> rename XML
|
# no old -> rename XML
|
||||||
echo "Create $filename.xml"
|
echo "Create $filename.xml"
|
||||||
mv "$directory/$filename.xml.new" "$directory/$filename.xml"
|
mv "$directory/$filename.xml.new" "$directory/$filename.xml"
|
||||||
|
Reference in New Issue
Block a user