From 27debea5a063352c9aa36622688068206beedff8 Mon Sep 17 00:00:00 2001
From: Robert Bieber <robby@bieberphoto.com>
Date: Mon, 5 Jul 2010 20:42:08 +0000
Subject: Theme Editor: Fixed redundant directory separator bug in
 addresourcedir script

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27299 a1c6a512-1295-4272-9138-f99709370657
---
 utils/themeeditor/addresourcedir.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'utils/themeeditor/addresourcedir.php')

diff --git a/utils/themeeditor/addresourcedir.php b/utils/themeeditor/addresourcedir.php
index 3c2ac33f04..cd34433077 100755
--- a/utils/themeeditor/addresourcedir.php
+++ b/utils/themeeditor/addresourcedir.php
@@ -25,11 +25,10 @@ if($argc < 2)
     $path = getcwd();
 else
     $path = $argv[1];
-if($path[count($path) - 1] != '/')
-    $path = $path . '/';
+$path = rtrim($path, "/");
 $dir = dir($path);
 $split = explode("/", $path);
-$last = $split[count($split) - 2];
+$last = $split[count($split) - 1];
 echo "\t<qresource prefix=\"/$last\">\n";
 while(false !== ($entry = $dir->read()))
 {
@@ -37,7 +36,7 @@ while(false !== ($entry = $dir->read()))
         continue;
     echo "\t\t";
     echo "<file alias = \"$entry\">";
-    echo $path . $entry . "</file>";
+    echo $path . '/' . $entry . "</file>";
     echo "\n";
 }
 echo "\t</qresource>\n";
-- 
cgit v1.2.3