src/feed: Accept a combined conf file instead of 2

1 files changed, 6 insertions, 10 deletions

diff --git a/src/feed b/src/feed
index aa42899..66d80e0 100755
--- a/src/feed
+++ b/src/feed
@@ -3,18 +3,14 @@ set -euo pipefail
 
 
 usage() {
-	echo 'Usage: feed BASECONF GLOBALCONF FILENAME.sortdata...'
+	echo 'Usage: feed COMBINEDCONF FILENAME.sortdata...'
 }
 
-BASECONF="${1:-}"
-GLOBALCONF="${2:-}"
-FILES="${3:-}"
-eval "$(assert-arg -- "$BASECONF"   'BASECONF')"
-eval "$(assert-arg -- "$GLOBALCONF" 'GLOBALCONF')"
-eval "$(assert-arg -- "$FILES"      'FILENAME.sortdata...')"
-. "$(realpath -- "$BASECONF")"
-. "$(realpath -- "$GLOBALCONF")"
-shift
+COMBINEDCONF="${1:-}"
+FILES="${2:-}"
+eval "$(assert-arg -- "$COMBINEDCONF" 'COMBINEDCONF')"
+eval "$(assert-arg -- "$FILES"        'FILENAME.sortdata...')"
+. "$(realpath -- "$COMBINEDCONF")"
 shift