Add cleanup work tree option

Cleans git work tree after running custom commands. Does not clean TARGET_DIR

Author: SagePtr

README.md

@@ -102,6 +102,7 @@ If you are using a public repository you can start here.
   * __RSYNC_FLAGS__: (optional) override rsync flags. By default, it's `-rltgoDzvO` .
   * __COMMANDS_BEFORE_RSYNC__: (optional) array of commands executed between pulling remote repository and copying files to target directory. These commands are executed under `GIT_DIR` directory.
   * __COMMANDS_AFTER_RSYNC__: (optional) array of commands executed after copying files to target directory. These commands are executed under `TARGET_DIR` directory.
+  * __CLEANUP_WORK_TREE__: (optional) set to `true` if you want to clean `GIT_DIR` from intermediate files created by custom commands and rebuild project from scratch every time. Does not affect `TARGET_DIR` at all.
 
 NOTE: do not include/track the files `deploy-config.php` and `VERSION` in your repository.
 

deploy-config.orig.php

@@ -98,3 +98,11 @@
  * Example: define('COMMANDS_AFTER_RSYNC', serialize(array('rm cache/*.php -f')));
  */
 define('COMMANDS_AFTER_RSYNC', serialize(array()));
+
+/* CLEANUP_WORK_TREE:
+ * Clean GIT_DIR from leftovers after custom commands
+ * Set to true if you wish to clean up GIT_DIR after running all custom commands
+ * Useful if your custom commands create intermediate files you want not to keep between deployments
+ * However, intermediate files would not be cleaned up from TARGET_DIR
+ */
+define('CLEANUP_WORK_TREE', false);

deploy.php

@@ -448,6 +448,16 @@ function cmd($command, $print = true, $dir = GIT_DIR) {
 	}
 }
 
+// Cleanup work tree from build results, etc
+if(defined('CLEANUP_WORK_TREE') && !empty(CLEANUP_WORK_TREE)){
+	echo "\nCleanup work tree\n";
+	cmd(sprintf(
+		'git --git-dir="%s.git" --work-tree="%s" clean -dfx'
+		, GIT_DIR
+		, GIT_DIR
+	));
+}
+
 // Update version file to current commit
 echo "\nUpdate target directory version file to commit $checkout\n";
 cmd(sprintf(