add reading of local .svnignore file over defaults (#37)

add reading of local .svnignore file over defaults

Author: GaryJones

README.md

@@ -1,11 +1,11 @@
 # WordPress Plugin Directory Deployment Script
 
 Deploys a WordPress plugin from a local Git repo to the WordPress Plugin Repostiory (SVN).
- 
+
 ## Steps
 
 These are the steps that the script takes:
- 
+
  1. Asks for plugin slug.
  2. Asks for local plugin directory.
  3. Checks local plugin directory exists.
@@ -33,9 +33,17 @@ These are the steps that the script takes:
 2. Ensure that the shell script is executable. In Mac / Unix, run `chmod +x deploy.sh`.
 3. Run the script with `sh deploy.sh`. You can also double-click it in Finder / Explorer to start it.
 4. You'll now be guided through a set of questions.
- 
+
 I prefer to keep this script in the root of my projects directory. Each project directory is named as the plugin slug, as is the corresponding GitHub repo. To use, just call the script, enter the plugin slug, confirm or amend default suggestions, and sit back as the code is sent to SVN and git repos including tags. The commit messages here are hard-coded for consistency.
 
+## Extras
+
+You may define your own `.svnignore` file similar to an `svn propset svn:ignore .svnignore` command. This will remove any listed files and/or directories from committing to the Plugins Directory.
+
+NB: you must list files separately, no wildcards.
+
+Reference: https://stackoverflow.com/questions/17298668/svn-ignore-like-gitignore
+
 ## Credits
 
 At one point, well over 90% of this script was written by others:
@@ -45,8 +53,8 @@ At one point, well over 90% of this script was written by others:
  - **[Patrick Rauland](https://twitter.com/BFTrick)** - [Support for WP assets folder for plugin page banner and screenshots](https://github.com/BFTrick/jotform-integration/blob/master/deploy.sh)
  - **[Ben Balter](https://twitter.com/benbalter)** - [Submodules support and plugin slug prompt](https://github.com/benbalter/Github-to-WordPress-Plugin-Directory-Deployment-Script/)
  - **[Gary Jones](https://twitter.com/GaryJ)** *(me)* - [Personalisation and commenting out bits not required when using git-flow](https://github.com/GaryJones/wordpress-plugin-git-flow-svn-deploy)
- 
- There has been a significant amount of changes since then though. 
+
+ There has been a significant amount of changes since then though.
 
 
 ## License

deploy.sh

@@ -25,7 +25,7 @@
 # 20. Delete temporary local SVN checkout.
 
 echo
-echo "WordPress Plugin SVN Deploy v3.0.0"
+echo "WordPress Plugin SVN Deploy v3.1.0"
 echo
 echo "Let's collect some information first. There are six questions."
 echo
@@ -157,12 +157,22 @@ svn checkout $SVNURL $SVNPATH --depth immediates
 svn update --quiet $SVNPATH/trunk --set-depth infinity
 
 echo "Ignoring GitHub specific files"
-svn propset svn:ignore "README.md
+# Use local .svnignore if present
+if [ -f ".svnignore" ]; then
+	echo "Using local .svnignore"
+	SVNIGNORE=$( <.svnignore )
+else
+	echo "Using default .svnignore"
+	SVNIGNORE="README.md
 Thumbs.db
-.github/*
+.github
 .git
 .gitattributes
-.gitignore" "$SVNPATH/trunk/"
+.gitignore
+composer.lock"
+fi
+
+svn propset svn:ignore \""$SVNIGNORE"\" "$SVNPATH/trunk/"
 
 echo "Exporting the HEAD of master from git to the trunk of SVN"
 git checkout-index -a -f --prefix=$SVNPATH/trunk/
@@ -201,6 +211,8 @@ echo
 echo "Changing directory to SVN and committing to trunk."
 cd $SVNPATH/trunk/
 # Delete all files that should not now be added.
+# Use $SVNIGNORE for `rm -rf`. Setting propset svn:ignore seems flaky.
+echo "$SVNIGNORE" | awk '{print $0}' | xargs rm -rf
 svn status | grep -v "^.[ \t]*\..*" | grep "^\!" | awk '{print $2"@"}' | xargs svn del
 # Add all new files that are not set to be ignored
 svn status | grep -v "^.[ \t]*\..*" | grep "^?" | awk '{print $2"@"}' | xargs svn add