projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
api4 - Apply standard headers
[civicrm-core.git]
/
distmaker
/
distmaker.sh
diff --git
a/distmaker/distmaker.sh
b/distmaker/distmaker.sh
index 933be8d2de826e1f41563ccdacaff62dac884ebf..e1d3541292df91fd203c4ef6aecaf994b22eda54 100755
(executable)
--- a/
distmaker/distmaker.sh
+++ b/
distmaker/distmaker.sh
@@
-238,13
+238,10
@@
if [ -d "$DM_SOURCEDIR/drupal-8" ]; then
dm_git_checkout "$DM_SOURCEDIR/drupal-8" "$DM_REF_DRUPAL8"
fi
dm_git_checkout "$DM_SOURCEDIR/drupal-8" "$DM_REF_DRUPAL8"
fi
-## Get latest dependencies
+## Get fresh dependencies
+[ -d "$DM_SOURCEDIR/vendor" ] && rm -rf $DM_SOURCEDIR/vendor
+[ -d "$DM_SOURCEDIR/bower_components" ] && rm -rf $DM_SOURCEDIR/bower_components
dm_generate_vendor "$DM_SOURCEDIR"
dm_generate_vendor "$DM_SOURCEDIR"
-## if we already have a bower_compoents dir empty it.
-if [ -d "$DM_SOURCEDIR/bower_components" ]; then
- rm -rf $DM_SOURCEDIR/bower_components/*
-fi
-dm_generate_bower "$DM_SOURCEDIR"
# Before anything - regenerate DAOs
# Before anything - regenerate DAOs