From 3d9de3d3775d1ac0a204b07e141732db9065e284 Mon Sep 17 00:00:00 2001
From: Konstantin Baierer <unixprog@gmail.com>
Date: Tue, 22 Sep 2020 16:01:26 +0200
Subject: [PATCH] bashlib: align non-arg-help behavior with python core

---
 ocrd/bashlib/src/parse_argv.bash | 11 ++++++++---
 ocrd/ocrd/lib.bash               | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ocrd/bashlib/src/parse_argv.bash b/ocrd/bashlib/src/parse_argv.bash
index 9ca0e2464f..9ed027a0bc 100644
--- a/ocrd/bashlib/src/parse_argv.bash
+++ b/ocrd/bashlib/src/parse_argv.bash
@@ -18,7 +18,13 @@ ocrd__parse_argv () {
         ocrd__raise "Must set \$params (declare -A params)"
     fi
 
+    if [[ $# = 0 ]];then
+        ocrd__usage
+        exit 1
+    fi
+
     ocrd__argv[overwrite]=false
+    ocrd__argv[mets_file]="$PWD/mets.xml"
 
     local __parameters=()
     local __parameter_overrides=()
@@ -42,9 +48,8 @@ ocrd__parse_argv () {
         shift
     done
 
-    if [[ ! -r "${ocrd__argv[mets_file]:=$PWD/mets.xml}" ]];then
-        ocrd__usage
-        exit 1
+    if [[ ! -e "${ocrd__argv[mets_file]}" ]];then
+        ocrd__raise "METS file '${ocrd__argv[mets_file]}' not found"
     fi
 
     if [[ ! -d "${ocrd__argv[working_dir]:=$(dirname "${ocrd__argv[mets_file]}")}" ]];then
diff --git a/ocrd/ocrd/lib.bash b/ocrd/ocrd/lib.bash
index 37cfb5f659..3cd38f20ec 100644
--- a/ocrd/ocrd/lib.bash
+++ b/ocrd/ocrd/lib.bash
@@ -106,7 +106,13 @@ ocrd__parse_argv () {
         ocrd__raise "Must set \$params (declare -A params)"
     fi
 
+    if [[ $# = 0 ]];then
+        ocrd__usage
+        exit 1
+    fi
+
     ocrd__argv[overwrite]=false
+    ocrd__argv[mets_file]="$PWD/mets.xml"
 
     local __parameters=()
     local __parameter_overrides=()
@@ -130,9 +136,8 @@ ocrd__parse_argv () {
         shift
     done
 
-    if [[ ! -r "${ocrd__argv[mets_file]:=$PWD/mets.xml}" ]];then
-        ocrd__usage
-        exit 1
+    if [[ ! -e "${ocrd__argv[mets_file]}" ]];then
+        ocrd__raise "METS file '${ocrd__argv[mets_file]}' not found"
     fi
 
     if [[ ! -d "${ocrd__argv[working_dir]:=$(dirname "${ocrd__argv[mets_file]}")}" ]];then