Convert tools now use uppercase hex.

Bugfix: Removed leading empty line of a dump (raw-dump2mct-dump.sh).
lh414035210 · Jul 15, 2013 · 29fded1 · 29fded1
1 parent d3632de
commit 29fded1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tools/dump-file-converter/raw-dump2mct-dump.sh b/tools/dump-file-converter/raw-dump2mct-dump.sh
@@ -37,7 +37,7 @@ file=${1:?no dump file given}
 s=$(ls -l $file | cut -d ' ' -f 5)
 if [ $s -eq 320 -o $s -eq 1024 -o $s -eq 2048 -o $s -eq 4096 ]
 then
-    hex=$(xxd -p $file | tr -d '\n')
+    hex=$(xxd -u -p $file | tr -d '\n')
     line=""
     i=1
     sec=0
@@ -59,6 +59,8 @@ then
         (( i=i+32 ))
         (( blk++ ))
     done
+    # Remove first "\n".
+    out=${out:2:${#out}}
     echo -e "$out"
 else
     echo "Not a (complete) dump."

diff --git a/tools/key-file-converter/prox-keys2mct-keys.sh b/tools/key-file-converter/prox-keys2mct-keys.sh
@@ -31,4 +31,4 @@
 ########################################################################
 
 
-sed -n '4,19 s/^.\{7\}\(.\{12\}\).\{9\}\(.\{12\}\).*$/\1\n\2/p' ${1:?no key file given} | sort -u
+sed -n '4,19 s/^.\{7\}\(.\{12\}\).\{9\}\(.\{12\}\).*$/\U\1\n\U\2/p' ${1:?no key file given} | sort -u