Check for and move .ovl files properly (Archos Recorder fix)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7726 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 3 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 3d6a42137c..0ad47f7c3a 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -80,7 +80,7 @@ sub buildzip {
         if ($line =~ /([^,]*),([^,]*),/) {
             my ($ext, $plugin)=($1, $2);
             my $r = "${plugin}.rock";
-            my $o = "${plugin}.ovl";
+            my $oname;
 
             my $dir = $r;
             my $name;
@@ -90,6 +90,10 @@ sub buildzip {
             # store the file name part
             $name = $2;
 
+            # get .ovl name (file part only)
+            $oname = $name;
+            $oname =~ s/\.rock$/.ovl/;
+
             # print STDERR "$ext $plugin $dir $name $r\n";
 
             if(-e ".rockbox/rocks/$name") {
@@ -105,10 +109,11 @@ sub buildzip {
                 # was already moved to the viewers dir
                 print VIEWERS $line;
             }
-            if(-e ".rockbox/rocks/$o") {
+
+            if(-e ".rockbox/rocks/$oname") {
                 # if there's an "overlay" file for the .rock, move that as
                 # well
-                `mv .rockbox/rocks/$o .rockbox/$o`;              
+                `mv .rockbox/rocks/$oname .rockbox/$dir`;
             }
         }
     }