From db48c6a9706a51684a5c4eb2142c086acb94334f Mon Sep 17 00:00:00 2001 From: Reidar Cederqvist Date: Thu, 7 Jun 2018 09:11:47 +0200 Subject: [PATCH] AAXtoMP3: fix how .authcode is located fix issue #60 --- AAXtoMP3 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/AAXtoMP3 b/AAXtoMP3 index 3fa4de7..0cfabc1 100755 --- a/AAXtoMP3 +++ b/AAXtoMP3 @@ -55,18 +55,19 @@ auth_code=""; for dir in $authcodeDirs; do codeFile="${dir}$authcode"; - if [ ! -f "$codeFile" ]; then - auth_code=$1 - shift - break; - elif [ -s "$codeFile" ]; then - auth_code=`head -1 "$codeFile"` - break; - else - echo "INFO: Sorry, empty \"$codeFile\" found, skipping."; + if [ ! -f "$codeFile" -o ! -s "$codeFile" ]; then + codeFile="" + echo "INFO: Sorry, missing or empty \"$codeFile\" found, skipping."; fi; done; +if [ ! -f "$codeFile" ]; then + auth_code=$1 + shift +else + auth_code=`head -1 "$codeFile"` +fi + if [ -z "$auth_code" ]; then echo "INFO: Sorry, no authcode provided."; exit 1;