X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=distmaker%2Fdistmaker.sh;h=179c54aacd731e30ddccff9ce6c87b842fd383dc;hb=a49aa7dd0f16ecff2a7d7c2d9fdb93813ae8c323;hp=b3967adc451ffc881521837864ec304bd81adbca;hpb=62e94fbb273c77ca55a148f2e0bc5105bd6efbc9;p=civicrm-core.git

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index b3967adc45..179c54aacd 100755
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -156,9 +156,6 @@ case $1 in
 
 esac
 
-## Install npm packages
-dm_npm_install "$DM_SOURCEDIR"
-
 ## Make sure we have the right branch or tag
 dm_git_checkout "$DM_SOURCEDIR" "$DM_REF_CORE"
 dm_git_checkout "$DM_SOURCEDIR/packages" "$DM_REF_PACKAGES"
@@ -168,11 +165,12 @@ dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
 
 ## Get latest dependencies
 dm_generate_vendor "$DM_SOURCEDIR"
+dm_generate_bower "$DM_SOURCEDIR"
 
 # Before anything - regenerate DAOs
 
 cd $DM_SOURCEDIR/xml
-$DM_PHP GenCode.php schema/Schema.xml $DM_VERSION
+${DM_PHP:-php} GenCode.php schema/Schema.xml $DM_VERSION
 
 cd $ORIGPWD