From 1c801ebeaacd92d08b0225dd7e8c8e7963aa59d8 Mon Sep 17 00:00:00 2001 From: FRIGN Date: Fri, 11 Dec 2015 14:51:02 +0100 Subject: Use stdin and stdout with 2ff It always seemed odd to have a file-argument for 2ff, given all other farbfeld conversion tools operate on stdin and stdout only. Given I received numerous e-mails on this matter I've decided to change the usage to lessen the confusion. Maybe there's a way to do some magic with tee(1), but I didn't bother just yet. To ease the transition, the number of arguments are checked and a usage printed if arguments are given. --- 2ff | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to '2ff') diff --git a/2ff b/2ff index af4d7b3..2b0cbd9 100755 --- a/2ff +++ b/2ff @@ -1,8 +1,18 @@ #!/bin/sh -FORMAT=`file -ib "$1" | cut -d ";" -f 1` +if [ "$#" -ne 0 ]; then + echo "usage: $0" >&2 + exit 1 +fi + +TMP=$(mktemp) +cat > $TMP; + +FORMAT=$(file -ib $TMP | cut -d ";" -f 1); case "$FORMAT" in - image/png) png2ff < "$1" ;; - image/jpeg) jpg2ff < "$1" ;; - *) convert "$1" png:- | png2ff ;; + image/png) png2ff < $TMP ;; + image/jpeg) jpg2ff < $TMP ;; + *) convert $TMP png:- | png2ff ;; esac + +rm $TMP; -- cgit v1.2.3