From 00d779286c700b450c21d2dc86c3704634000213 Mon Sep 17 00:00:00 2001
From: Alexander Wenzel <elkangaroo@googlemail.com>
Date: Fri, 11 Apr 2014 21:55:01 +0200
Subject: [PATCH 1/2] fix #335: unify (loc / quality trend) graph labels

---
 public/assets/js/build-plugins/loc.js      | 4 ++--
 public/assets/js/build-plugins/warnings.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js
index df0b4ce6..d71a42ad 100644
--- a/public/assets/js/build-plugins/loc.js
+++ b/public/assets/js/build-plugins/loc.js
@@ -47,7 +47,7 @@ var locPlugin = PHPCI.UiPlugin.extend({
         var titles = ['Build', 'Lines', 'Comment Lines', 'Non-Comment Lines', 'Logical Lines'];
         var data = [titles];
         for (var i in builds) {
-            data.push(['Build ' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]);
+            data.push(['#' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]);
         }
 
         var data = google.visualization.arrayToDataTable(data);
@@ -63,4 +63,4 @@ var locPlugin = PHPCI.UiPlugin.extend({
     }
 });
 
-PHPCI.registerPlugin(new locPlugin());
\ No newline at end of file
+PHPCI.registerPlugin(new locPlugin());
diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js
index 6bd371a1..8b86a1e7 100644
--- a/public/assets/js/build-plugins/warnings.js
+++ b/public/assets/js/build-plugins/warnings.js
@@ -87,8 +87,8 @@ var warningsPlugin = PHPCI.UiPlugin.extend({
 
         var data = google.visualization.arrayToDataTable(data);
         var options = {
-            hAxis: {title: 'Build'},
-            vAxis: {title: 'Warnings'},
+            hAxis: {title: 'Builds'},
+            vAxis: {title: 'Warnings / Errors'},
             backgroundColor: { fill: 'transparent' },
             height: 275,
             pointSize: 3

From 5cb37f3291503189ed20ae6d1b53e4b4550c0f69 Mon Sep 17 00:00:00 2001
From: Claus Due <claus@namelesscoder.net>
Date: Sat, 12 Apr 2014 13:52:26 +0200
Subject: [PATCH 2/2] Cross-platform safe copy in Plugin.CopyBuild

Rather than using `xargs` which behaves differently on BSD and Linux, it's safer to use the straight `cp`. We lose the output of which files were copied - but I'd be more than happy to add this as a separate command to list which files were copied and which were ignored.
---
 PHPCI/Plugin/CopyBuild.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php
index c06408b8..39d41e3f 100644
--- a/PHPCI/Plugin/CopyBuild.php
+++ b/PHPCI/Plugin/CopyBuild.php
@@ -43,7 +43,7 @@ class CopyBuild implements \PHPCI\Plugin
             return false;
         }
 
-        $cmd = 'mkdir -p "%s" && ls -1a "%s"* | xargs -r -t "%s/"';
+        $cmd = 'mkdir -p "%s" && cp -R "%s" "%s"';
         $success = $this->phpci->executeCommand($cmd, $this->directory, $build, $this->directory);
 
         if ($this->ignore) {