From 362f08cd4ce1839bb1d99cf4b322315c0c44c370 Mon Sep 17 00:00:00 2001
From: Olivier Perez <olivier@olivierperez.fr>
Date: Fri, 10 Apr 2015 14:00:28 +0200
Subject: [PATCH] Refactor the packaging script

---
 scripts/packaging.php | 45 +++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/scripts/packaging.php b/scripts/packaging.php
index fb29561..f851c31 100644
--- a/scripts/packaging.php
+++ b/scripts/packaging.php
@@ -43,7 +43,7 @@ function rcopy($src, $dst) {
         }
     }
     closedir($dir);
-    return $copied;
+    return !!$copied;
 }
 
 function rrmdir($dir) {
@@ -58,6 +58,22 @@ function copyDependencyToBuild($dirname) {
     return @mkdir(BUILD_VENDOR . $dirname, 755, true) && @rcopy(VENDOR . $dirname, BUILD_VENDOR . $dirname);
 }
 
+function copyFiles($files, &$result) {
+    foreach ($files as $key => $file) {
+        if (is_int($key)) {
+            $key = $file;
+        }
+
+        if (is_dir(ROOT . '/' . $key)) {
+            $result->$key = @rcopy(ROOT . '/' . $key, BUILD . '/' . $file);
+        } elseif (is_file(ROOT . '/' . $key)) {
+            $result->$key = @copy(ROOT . '/' . $key, BUILD . '/' . $file);
+        }
+
+        i($result->$key, $key);
+    }
+}
+
 function zip($source, $destination) {
     if (extension_loaded('zip')) {
         if (file_exists($source)) {
@@ -139,27 +155,14 @@ i($result->autoload, 'autoload');
 // Copy assets
 
 d('# Assets');
-
-$assets = array('css', 'fonts', 'images', 'js');
-
-foreach ($assets as $asset) {
-    $result->$asset = @rcopy(ROOT . '/' . $asset, BUILD . '/' . $asset);
-    i($result->$asset, $asset);
-}
+copyFiles(array('css', 'fonts', 'images', 'js'), $result);
 
 // Copy sources
 
 d('# Source directories');
-
-$dirs = array('admin', 'app', 'locale', 'tpl');
-
-foreach ($dirs as $dir) {
-    $result->$dir = @rcopy(ROOT . '/' . $dir, BUILD . '/' . $dir);
-    i($result->$dir, $dir);
-}
+copyFiles(array('admin', 'app', 'locale', 'tpl'), $result);
 
 d('# Source files');
-
 $files = array(
     'adminstuds.php',
     'bandeaux.php',
@@ -179,17 +182,17 @@ $files = array(
     'robots.txt',
     'studs.php'
 );
-
-foreach ($files as $file) {
-    $result->$file = @copy(ROOT . '/' . $file, BUILD . '/' . $file);
-    i($result->$file, $file);
-}
+copyFiles($files, $result);
 
 // Zip Dist
 $output = DIST . '/framadate-' . VERSION . '-' . date('Ymd') . '.zip';
 zip(BUILD, $output);
 rrmdir(BUILD);
 
+if (isset($_GET['verbose'])) {
+    var_dump($result);
+}
+
 d('--------');
 d('Distribution file: ' . realpath($output));