diff options
author | Dirk Engling <erdgeist@erdgeist.org> | 2014-02-07 21:21:03 +0100 |
---|---|---|
committer | Dirk Engling <erdgeist@erdgeist.org> | 2014-02-07 21:21:03 +0100 |
commit | b2714458565cac46ec1a79311fec5d4baef415e2 (patch) | |
tree | 85502164926debd9912f3540baea9475484288be /src | |
parent | a62a0a5a509cfaea35740a79dc473da9d0f69c8d (diff) |
Remove unnecessary test for DAT/STRASSEN.DAT
Diffstat (limited to 'src')
-rwxr-xr-x | src/makecolumns.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/makecolumns.sh b/src/makecolumns.sh index 4ed1f86..6f6f9d9 100755 --- a/src/makecolumns.sh +++ b/src/makecolumns.sh | |||
@@ -28,8 +28,6 @@ main() { | |||
28 | mkdir -p ../work_`basename ${1#white_}` | 28 | mkdir -p ../work_`basename ${1#white_}` |
29 | cd ../work_`basename ${1#white_}` || exit 1 | 29 | cd ../work_`basename ${1#white_}` || exit 1 |
30 | 30 | ||
31 | unset strassen; [ -f $1/dat/strassen.dat ] && strassen=$1/dat/strassen.dat | ||
32 | |||
33 | if [ -f "$1/phonebook.db" ]; then | 31 | if [ -f "$1/phonebook.db" ]; then |
34 | handle_new_format $1 | 32 | handle_new_format $1 |
35 | elif [ -f $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] ]; then | 33 | elif [ -f $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] ]; then |
@@ -81,6 +79,7 @@ do_processfile_old() { | |||
81 | } | 79 | } |
82 | 80 | ||
83 | handle_old_format() { | 81 | handle_old_format() { |
82 | echo "Working on $1. Detected pre-2004 Telefonbuch version." | ||
84 | # Extract teiln.dat | 83 | # Extract teiln.dat |
85 | do_decompress_old $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat" | 84 | do_decompress_old $1/[Dd][Aa][Tt]/[Tt][Ee][Ii][Ll][Nn].[Dd][Aa][Tt] "teiln.dat" |
86 | 85 | ||