From 29c24e647cb4c4a0928382a9ab2964980898562b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Aug 2014 19:24:03 +0200
Subject: Get rid of DIRECTORY_SEPARATOR for consistency

---
 bin/update.sh   | 2 +-
 bin/updatedb.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/update.sh b/bin/update.sh
index 91af6413d..f0c6d2f6c 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -157,7 +157,7 @@ if ($RCI->configured) {
   if ($RCI->config['db_dsnw']) {
     echo "Executing database schema update.\n";
     system("php " . INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
-      . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
+      . " --dir=" . INSTALL_PATH . "SQL", $res);
 
     $success = !$res;
   }
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
index daee6e835..964bc184c 100755
--- a/bin/updatedb.sh
+++ b/bin/updatedb.sh
@@ -116,7 +116,7 @@ if (empty($version)) {
     $version = 2012080700;
 }
 
-$dir = $opts['dir'] . DIRECTORY_SEPARATOR . $DB->db_provider;
+$dir = $opts['dir'] . '/' . $DB->db_provider;
 if (!file_exists($dir)) {
     rcube::raise_error("DDL Upgrade files for " . $DB->db_provider . " driver not found.", false, true);
 }
@@ -133,7 +133,7 @@ sort($result, SORT_NUMERIC);
 
 foreach ($result as $v) {
     echo "Updating database schema ($v)... ";
-    $error = update_db_schema($opts['package'], $v, $dir . DIRECTORY_SEPARATOR . "$v.sql");
+    $error = update_db_schema($opts['package'], $v, "$dir/$v.sql");
 
     if ($error) {
         echo "[FAILED]\n";
-- 
cgit v1.2.3