Move screenshots into assets directory

Fixes #4

bin/svn-push

@@ -12,7 +12,10 @@ fi
 
 git_root=$(pwd)
 
-git checkout master
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+if [ $current_branch != 'master' ]; then
+	git checkout master
+fi
 git pull
 svn_url=https://plugins.svn.wordpress.org/settings-revisions/
 svn_repo_dir=$git_root/svn
@@ -35,17 +38,26 @@ cat <(
 	git ls-files --cached --full-name $git_root | xargs -I {} dirname {} | sort | uniq
 ) | sort | rsync -avz --delete --include-from=- --exclude='*' $git_root/ ./
 
+# move assets directory to proper location in SVN
+rsync -avz --delete ./assets/ ../assets/
+rm -r ./assets/
+
 # convert .gitignores to svn:ignore
 for gitignore in $(find . -name .gitignore); do
 	echo "Convert $gitignore to svn:global-ignores"
 	svn propset svn:global-ignores -F $gitignore $(dirname $gitignore)
 	svn rm --force $gitignore
 done
 
-
+# Delete any files from SVN that are no longer there
 svn status . | grep "^\!" | sed 's/^\! *//g' | xargs svn rm
-svn add --force .
 
+# Add everything left to commit
+cd $svn_repo_dir
+svn add --force assets
+svn add --force trunk
+
+# Do SVN commit
 svn_commit_file=$svn_repo_dir/COMMIT_MSG
 
 git log -1 --format="Update to commit %h from $(git config --get remote.origin.url)" > $svn_commit_file
@@ -64,8 +76,11 @@ else
 	git log $git_log_args $last_pushed_commit..HEAD >> $svn_commit_file
 fi
 
-cd $svn_repo_dir
 
 svn commit -F $svn_commit_file
-
 rm $svn_commit_file
+
+# Restore branch
+if [ $current_branch != 'master' ]; then
+	git checkout $current_branch
+fi

php/readme-parser.php

@@ -95,7 +95,7 @@ function to_markdown( $params = array() ) {
 					$screenshot_name = $screenshot_match[1];
 					$new_body .= sprintf( "### %s\n", $screenshot_name );
 					$new_body .= "\n";
-					$new_body .= sprintf( "![%s](screenshot-%d.png)\n", $screenshot_name, $i + 1 );
+					$new_body .= sprintf( "![%s](assets/screenshot-%d.png)\n", $screenshot_name, $i + 1 );
 					$new_body .= "\n";
 				}
 				return $new_body;

readme.md

@@ -24,35 +24,35 @@ Requires PHP 5.3!
 
 ### Collapsed customizer section
 
-![Collapsed customizer section](screenshot-1.png)
+![Collapsed customizer section](assets/screenshot-1.png)
 
 ### Expanded customizer section
 
-![Expanded customizer section](screenshot-2.png)
+![Expanded customizer section](assets/screenshot-2.png)
 
 ### Open dropdown of revisions
 
-![Open dropdown of revisions](screenshot-3.png)
+![Open dropdown of revisions](assets/screenshot-3.png)
 
 ### Change setting starts new revision
 
-![Change setting starts new revision](screenshot-4.png)
+![Change setting starts new revision](assets/screenshot-4.png)
 
 ### Revision select during save
 
-![Revision select during save](screenshot-5.png)
+![Revision select during save](assets/screenshot-5.png)
 
 ### New revision prepended to list
 
-![New revision prepended to list](screenshot-6.png)
+![New revision prepended to list](assets/screenshot-6.png)
 
 ### Selecting previous revision loads old settings into customizer for preview before saving
 
-![Selecting previous revision loads old settings into customizer for preview before saving](screenshot-7.png)
+![Selecting previous revision loads old settings into customizer for preview before saving](assets/screenshot-7.png)
 
 ### Confirmation when restoring revision atop unsaved changes
 
-![Confirmation when restoring revision atop unsaved changes](screenshot-8.png)
+![Confirmation when restoring revision atop unsaved changes](assets/screenshot-8.png)
 
 ## Changelog ##