From 328278c91fbf000b9607aac4e78a45fba749621f Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Thu, 8 May 2014 09:45:05 +0000
Subject: [PATCH] Add an option "-n" --no-clober to the recursive_copy method
 used in the install

---
 resources/classes/install.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/resources/classes/install.php b/resources/classes/install.php
index 455838a3d4..37ed4a964c 100644
--- a/resources/classes/install.php
+++ b/resources/classes/install.php
@@ -35,7 +35,9 @@ include "root.php";
 		var $switch_scripts_dir;
 		var $switch_sounds_dir;
 
-		function recursive_copy($src, $dst) {
+		//$option '-n' --no-clobber
+		function recursive_copy($src, $dst, $option = '') {
+
 			$dir = opendir($src);
 			if (!$dir) {
 				if (!mkdir($src, 0755, true)) {
@@ -53,10 +55,15 @@ include "root.php";
 						$this->recursive_copy($src.'/'.$file, $dst.'/'.$file);
 					}
 					else {
-						//copy only missing files
-							if (!file_exists($dst.'/'.$file)) {
+						//copy only missing files -n --no-clobber
+							if ($option == '-n') {
+								if (!file_exists($dst.'/'.$file)) {
+									copy($src.'/'.$file, $dst.'/'.$file);
+									//echo "copy(".$src."/".$file.", ".$dst."/".$file.");<br />\n";
+								}
+							}
+							else {
 								copy($src.'/'.$file, $dst.'/'.$file);
-								//echo "copy(".$src."/".$file.", ".$dst."/".$file.");<br />\n";
 							}
 					}
 				}
@@ -124,7 +131,7 @@ include "root.php";
 				}
 				$dst_dir = $this->switch_scripts_dir;
 				if (is_readable($this->switch_scripts_dir)) {
-					$this->recursive_copy($src_dir, $dst_dir);
+					$this->recursive_copy($src_dir, $dst_dir, "-n");
 					unset($src_dir, $dst_dir);
 				}
 			}