Changeset 3246

Timestamp:

11/29/06 21:35:16 (6 years ago)

Author:

gregmac

Message:

Fix bug with md5 checking in install_amp; Add detection for whitespace-only differences

Files:

• freepbx/trunk/install_amp (modified) (4 diffs)

freepbx/trunk/install_amp

@@ -194 +194 @@
-      case "d": 
-        out("");
-
+
+
-      break;
-      case "s":
@@ -232 +233 @@
-}
-
+function checkDiff($file1, $file2) {
+  // diff, ignore whitespace and be quiet
+  exec("diff -wq ".escapeshellarg($file2)." ".escapeshellarg($file1), $output, $retVal);
+  return ($retVal != 0);
+}
+
-function amp_mkdir($directory, $mode = "0755", $recursive = false) {
-  debug("mkdir ".$directory.", ".$mode);
@@ -297 +304 @@
-      $destination=str_replace("/agi-bin",trim($asterisk_conf["astagidir"]),$destination);
-      $destination=str_replace("/sounds",trim($asterisk_conf["astvarlibdir"])."/sounds",$destination);
-
+
-      // if this is a directory, ensure destination exists
-      if (is_dir($source)) {
@@ -307 +314 @@
-      }
-      
+      //var_dump($md5sums);
-      if (!is_dir($source)) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-          $overwrite = true;