From dd38f38e898fbbf5ec830ca8260ba65c0935b230 Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 16 Mar 2019 14:52:48 +0100 Subject: [PATCH] folders with .'s at the end gave errors --- music-sync.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/music-sync.sh b/music-sync.sh index 4d59fac..24079a0 100755 --- a/music-sync.sh +++ b/music-sync.sh @@ -206,13 +206,14 @@ CreateFileList() { sourcepath="${1/\[/\\\[}/*" sourcepath="${sourcepath/\]/\\\]}" for file in $sourcepath; do - relfile="${file#"$1/"}" - if [[ -d "${1}/$relfile" ]]; then + origfile="${file#"$1/"}" + relfile=$(echo ${origfile} | sed -e 's/\(\.\)*$//g') + if [[ -d "${1}/$origfile" ]]; then newdir="${3}/$relfile" newdir=${newdir#"/"} VerboseOutput 1 "Entering $newdir" - CreateFileList "${1}/$relfile" "${2}/$relfile" "$newdir" - elif [[ ! -f "${2}/$relfile" || "${1}/$relfile" -nt "${2}/$relfile" ]]; then + CreateFileList "${1}/$origfile" "${2}/$relfile" "$newdir" + elif [[ "${1}/$origfile" != *".m3u" ]] && [[ ! -f "${2}/$relfile" || "${1}/$origfile" -nt "${2}/$relfile" ]]; then echo ${3}/$relfile >> /tmp/music-sync-filelist VerboseOutput 2 "Added: ${3}/${relfile}" fi