diff --git a/dhl.sh b/dhl.sh index d808c8e..7b9d627 100755 --- a/dhl.sh +++ b/dhl.sh @@ -7,7 +7,7 @@ tn2="dhl-cp1252-rn.csv" assert_tools () { while test $# -gt 0; do - command "$1" >/dev/null 2>/dev/null || { + command -v "$1" >/dev/null 2>/dev/null || { echo "tool missing: "$1 exit 2 } @@ -150,11 +150,11 @@ testiso3 () { testcmp "RUS" "iso3countrycode" "Russland" "Russia" "Russie" "Россия" testcmp "SVK" "iso3countrycode" "Slowakei" "Slovakia" "Slovaquie" "Slovensko" testcmp "ITA" "iso3countrycode" "Italien" "Italy" "Italie" "Italia" - testcmp "ITA" "iso3countrycode" "Italien" "Italy" "Italie" "Italia" testcmp "NOR" "iso3countrycode" "Norwegen" "Norway" "Norvège" "Norge" "Noreg" "Norga" testcmp "SWE" "iso3countrycode" "Schweden" "Sweden" "Suède" "Sverige" testcmp "DNK" "iso3countrycode" "Dänemarl" "Denmark" "Danemark" "Danmark" testcmp "ISL" "iso3countrycode" "Island" "Iceland" "Islande" "Ísland" + testcmp "ISR" "iso3countrycode" "Israel" "Israel" "Israël" testcmp "FIN" "iso3countrycode" "Finnland" "Finland" "Finlande" "Suomi" "Finland" testcmp "ESP" "iso3countrycode" "Spanien" "Spain" "Espagne" "España" testcmp "EST" "iso3countrycode" "Estland" "Estonia" "Estonie" "Eesti" @@ -163,7 +163,7 @@ testiso3 () { testcmp "IRL" "iso3countrycode" "Irland" "Ireland" "Irlande" "Éire" testcmp "IND" "iso3countrycode" "Indien" "India" "Inde" "Bharat" testcmp "CHN" "iso3countrycode" "China" "China" "Chine" "中国" "Zhōngguó" - testcmp "JPN" "iso3countrycode" "Japan" "Japan" "Japon" "Nippon" "Nihon" + testcmp "JPN" "iso3countrycode" "Japan" "Japan" "Japon" "Nippon" "Nihon" "日本国" "日本" testcmp "" "iso3countrycode" "Simbabwe" # should fail }