From aabf1c13f7c221d25364930fe3e7ce36b6c0cf36 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Wed, 3 Jul 2013 10:55:12 +0200 Subject: [PATCH 1/2] Reset assets directory and bower cache --- vendors.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/vendors.php b/vendors.php index be952f7c64..66dfc0ccc6 100755 --- a/vendors.php +++ b/vendors.php @@ -75,6 +75,26 @@ if (0 !== $code) { } } +// Remove previous assets +$assetDir = __DIR__. '/www/assets'; +$code = 0; +if (is_dir($assetDir)) { + system('rm -rf ' . escapeshellarg($assetDir), $code); +} + +if (0 !== $code) { + echo sprintf('Attention, failed to remove previous %s dependencies in %s', $bower, $assetDir); + echo "\n"; +} + +// Clean bower cache +system(sprintf('%s cache-clean', $bower), $code); + +if (0 !== $code) { + echo sprintf('Attention, failed to clean %s cache', $bower); + echo "\n"; +} + // Install asset dependencies with bower system(sprintf('%s install', $bower), $code); From 66249b6046bf005d66ffea5d42c623ba59352db2 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Wed, 3 Jul 2013 11:16:16 +0200 Subject: [PATCH 2/2] Adressed @romainneutron 's comments --- vendors.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendors.php b/vendors.php index 66dfc0ccc6..83afe27135 100755 --- a/vendors.php +++ b/vendors.php @@ -79,11 +79,11 @@ if (0 !== $code) { $assetDir = __DIR__. '/www/assets'; $code = 0; if (is_dir($assetDir)) { - system('rm -rf ' . escapeshellarg($assetDir), $code); + system('rm -r ' . escapeshellarg($assetDir), $code); } if (0 !== $code) { - echo sprintf('Attention, failed to remove previous %s dependencies in %s', $bower, $assetDir); + echo sprintf('Warning, failed to remove previous %s dependencies in %s', $bower, $assetDir); echo "\n"; } @@ -91,7 +91,7 @@ if (0 !== $code) { system(sprintf('%s cache-clean', $bower), $code); if (0 !== $code) { - echo sprintf('Attention, failed to clean %s cache', $bower); + echo sprintf('Warning, failed to clean %s cache', $bower); echo "\n"; }