diff --git a/eoa.rc b/eoa.rc index e8a4538..f6a1a70 100644 --- a/eoa.rc +++ b/eoa.rc @@ -66,8 +66,8 @@ function cpdi(){ # function to import new publication into EOAPP1.5 function pimp15(){ current_dir=$(pwd); - pnumber=$(grep '^Number:' $do/$1/django/publication.cfg| cut -f 2 -d ":"| tr -d '[:space:]'); - pseries=$(grep '^Serie:' $do/$1/django/publication.cfg| cut -f 2 -d ":"| tr -d '[:space:]'| tr '[:upper:]' '[:lower:]'); + pnumber=$(egrep '^Number( )?:' $do/$1/django/publication.cfg| cut -f 2 -d ":"| tr -d '[:space:]'); + pseries=$(egrep '^Serie( )?:' $do/$1/django/publication.cfg| cut -f 2 -d ":"| tr -d '[:space:]'| tr '[:upper:]' '[:lower:]'); import_dir="import_${pseries}${pnumber}"; mediafiles="$e15/runtime_data/res.rt/all_media_files/$pseries/$pnumber";