Improving upgrade path. (#302)

Author: grasmash

phing/tasks/blt.xml

@@ -20,10 +20,12 @@
 
   <target name="blt:rsync-template">
     <echo>Copying files from BLT's template into your project.</echo>
-    <!-- @todo Do not overwrite structured or executable files. Instead, update them intelligently. composer.json, project.yml, settings.php, drush.wrapper etc. -->
-    <exec dir="${repo.root}" command="rsync -a --no-g --no-p --update ${blt.root}/template/ ${repo.root}/ --exclude 'project.yml' --exclude 'composer.json'" logoutput="true" checkreturn="true"/>
-    <exec dir="${repo.root}" command="rsync -a --no-g --no-p --update ${blt.root}/template/project.yml ${repo.root}/ --ignore-existing" logoutput="true" checkreturn="true"/>
-    <exec dir="${repo.root}" command="rsync -a --no-g --no-p --update ${blt.root}/template/README.md ${repo.root}/ --ignore-existing" logoutput="true" checkreturn="true"/>
+    <!-- @todo Do not overwrite structured or executable files. Instead, update them intelligently settings.php, drush.wrapper etc. -->
+    <exec dir="${repo.root}" command="rsync -a --no-g ${blt.root}/template/ ${repo.root}/ --exclude '/project.yml' --exclude '/composer.json' --exclude '/README.md'" logoutput="true" checkreturn="true"/>
+
+    <!--Rsync files without overwriting existing-->
+    <exec dir="${repo.root}" command="rsync -a --no-g ${blt.root}/template/project.yml ${repo.root}/ --ignore-existing" logoutput="true" checkreturn="true"/>
+    <exec dir="${repo.root}" command="rsync -a --no-g ${blt.root}/template/README.md ${repo.root}/ --ignore-existing" logoutput="true" checkreturn="true"/>
   </target>
 
   <target name="update" depends="init, blt:update-yml, configure">

phing/tasks/validate.xml

@@ -62,6 +62,7 @@
   </target>
 
   <target name="validate:phpcs:fileset" description="Runs PHP Code Sniffer against only custom modules.">
+    <echo>Code sniffing ${fileset_refid}</echo>
     <!-- Sniff tests. -->
     <phpcodesniffer
       standard="${phpcs.ruleset}"

scripts/blt/convert-to-composer.sh

@@ -73,11 +73,12 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   echo ""
   echo "* Restart your terminal session to register your new blt alias."
   echo "* Review your codebase and commit the desired changes."
-  echo "* If you have a custom Phing build file, you will likely need to update it and add it to project.yml under the 'import' key. See readme/extending-blt.md."
-  echo "* If you are not using Lightning, remove lightning-specific target-hooks from project.yml."
-  # .travis.yml
-  # hash salt in settings.php
-  # readme overrides
+  echo "    * If you have a custom Phing build file, you will likely need to update it and add it to project.yml under the 'import' key. See readme/extending-blt.md."
+  echo "    * If you are not using Lightning, remove lightning-specific target-hooks from project.yml."
+  # link to online docs
+
+  ./vendor/bin/drupal yaml:get:value project.yml project.hash_salt > salt.txt
+  # remove project.hash_salt, project.themes, project.vendor from project.yml
 
 else
   exit 1