Allow decompress' reporting to be shown. Also report the progress in columns 1-based, not 0-based

1 files changed, 3 insertions, 3 deletions

diff --git a/src/makecolumns.sh b/src/makecolumns.sh
index 1d4c399..9e8d6cb 100755
--- a/src/makecolumns.sh
+++ b/src/makecolumns.sh
@@ -197,7 +197,7 @@ handle_new_format() {
     printf "done.\n"
 
     printf "Extracting phonebook.db ... "
-    decompress $1/phonebook.db | grep -v appropriate
+    decompress $1/phonebook.db
 
     rows=`find . -name file_\* | wc -l`
     rows=$(( rows / 11 ))
@@ -205,11 +205,11 @@ handle_new_format() {
 
     # Do enumerations with builtin shell tools. Unfortunally neither
     # jot nor seq are standards
-    printf "Splitting decompressed chunks into their columns (11 total) ... 0, "
+    printf "Splitting decompressed chunks into their columns (11 total) ... 1, "
     f=0; while [ $f -lt $rows ]; do printf "file_%05X " $(( f++ * 11)); done | xargs cat | xxd -ps -c1 > column_0
 
     for column in 1 2 3 4 5 6 7 8 9 10; do
-      printf "%d, " $column
+      printf "%d, " $(( column + 1 ))
       f=0; while [ $f -lt $rows ]; do printf "file_%05X " $(( column + f++ * 11 )); done | xargs cat | tr '\n\0' '\t\n' > column_${column}
     done
     printf "done.\n"