diff --git a/transfer.sh b/transfer.sh index 36f4a60..66e5ae7 100755 --- a/transfer.sh +++ b/transfer.sh @@ -96,19 +96,12 @@ function transfer::import() { local file=${filepath##*/} # strip directories from path - # ensure file has correct format - if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+$ ]]; then - logging::failure "[IMPORT] $file — Filename format invalid" - continue - fi - # Ensure filename matches expected format - if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+ ]]; then - logging::failure "[IMPORT] $file — Filename format invalid" + if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+$ ]]; then + logging::failure "[IMPORT] $file — eidf prefix wrong or missing" continue fi - # example file: eidf123-abc01-file.csv local project="${file%%-*}" # eidf123 local rest="${file#*-}" # abc01-file.csv