Deploy beta versions to beta branch

Author: Benjamin Pick

CONTRIBUTING.md

@@ -5,6 +5,7 @@ Depending on your skill and interests, here is what you can give:
 1. Code
 2. Documentation
 3. Support
+4. Beta-Testing
 4. Translation
 5. Donation
 
@@ -26,13 +27,19 @@ The documentation of PHP function is copied out of the code. If you want to modi
 
 If you need inspiration of what needs better documenting, look at the [support forum](https://wordpress.org/support/plugin/geoip-detect/). Hint: You can start with the things that you were stuck yourself when you started using the plugin, most probably others will learn from it.
 
-## 3. Support
+## 3. Beta-Testing
+
+Beta for me means "I *think* I'm finished, but ..." - often some errors only appear in a certain environment, or I have forgotten to support some edge case / options combination.
+So it would be great if you can install the beta version in your development and tell me if everything works, especially the features that have changed recently!
+How? See [Beta Testing](https://github.com/yellowtree/geoip-detect/wiki/Beta_Testing)
+
+## 4. Support
 
 Go to the [support forum](https://wordpress.org/support/plugin/geoip-detect/) and check for [unresolved (esp. un-replied)](https://wordpress.org/support/plugin/geoip-detect/unresolved/) threads. If you can answer the question, please do so! I probably would have replied also at some point, but maybe only weeks later. The questions range from beginner to very-techical, so I'm sure if you are an active user of the plugin, some question can be replied by you.
 
 You can subscribe to the forum by clicking on the `Subscribe` button on the top - BTW I have subscribed to the forum so I will see all requests and your replies as well. So don't worry, if I don't agree with you for some reason I will explain why ;-)
 
-## 4. Translation
+## 5. Translation
 
 I am maintaining the German translation of the plugin. If you want to translate the plugin UI into your own mother-tongue, here is how you do it:
 
@@ -42,7 +49,7 @@ I am maintaining the German translation of the plugin. If you want to translate
 * Then [submit a so-called PTE request](https://make.wordpress.org/polyglots/handbook/plugin-theme-authors-guide/pte-request/#sample-translation-reviewpte-request-by-a-plugintheme-author)
 * After each plugin update, there might be a few plugin strings changed. So from time to time, please check these "Fuzzy" or "Untranslated" strings
 
-## 5. Donation
+## 6. Donation
 
 This plugin is [charity-ware](https://github.com/yellowtree/geoip-detect/wiki/FAQ#what-do-you-mean-by-this-plugin-is-charity-ware):
 

deploy.sh

@@ -38,20 +38,37 @@ echo ".........................................."
 echo 
 
 # Check version in readme.txt is the same as plugin file
-#NEWVERSION1=`grep "^Stable tag" $GITPATH/readme.txt | awk -F' ' '{print $3}'`
-#echo "readme version: $NEWVERSION1"
-NEWVERSION2=`grep "^Version" $GITPATH/$MAINFILE | awk -F' ' '{print $2}'`
-NEWVERSION="$NEWVERSION2"
+NEWVERSION=`grep "^Version" $GITPATH/$MAINFILE | awk -F' ' '{print $2}'`
+echo "$MAINFILE version: $NEWVERSION"
+NEWVERSION2=`grep "^define.*GEOIP_DETECT_VERSION" $GITPATH/$MAINFILE | awk -F"'" '{print $4}'`
+echo "$MAINFILE define version: $NEWVERSION"
 
-echo "$MAINFILE version: $NEWVERSION2"
-NEWVERSION3=`grep "^define.*GEOIP_DETECT_VERSION" $GITPATH/$MAINFILE | awk -F"'" '{print $4}'`
-echo "$MAINFILE define version: $NEWVERSION3"
-
-# if [ "$NEWVERSION1" != "$NEWVERSION2" ] || [ "$NEWVERSION1" != "$NEWVERSION3" ]; then echo "Versions don't match. Exiting...."; exit 1; fi
-if [ "$NEWVERSION2" != "$NEWVERSION3" ]; then echo "Versions don't match. (php: '$NEWVERSION2', define: '$NEWVERSION3') Exiting...."; exit 1; fi
+if [ "$NEWVERSION" != "$NEWVERSION2" ]; then echo "Versions don't match. (php: '$NEWVERSION', define: '$NEWVERSION2') Exiting...."; exit 1; fi
 
 echo "Versions match in PHP file. Let's proceed..."
 
+if [[ $NEWVERSION == *"beta"* ]]; then BETA=1
+if [ "$1" = "beta" ] ; then BETA=1
+if [ "$BETA" = "1" ] ; then 
+	echo
+	echo "Release Beta version only"
+	echo
+fi
+
+function merge() {
+	local MERGE_FROM = $1
+	local MERGE_TO = $2
+
+	echo "Merging $MERGE_FROM into $MERGE_TO ..."
+	git checkout "$MERGE_TO" && git merge --strategy=fast-forward "$MERGE_FROM"
+	if [ $? != 0 ]; then 
+		echo "No merge possible with fast-forward, please merge $MERGE_FROM into $MERGE_TO manually ..."
+		exit 1;
+	fi
+}
+
+merge develop beta
+
 #echo "Compressing JS files..."
 #java -jar ~/bin/yuicompressor.jar --nomunge --preserve-semi -o "$GITPATH/tinymce/editor_plugin.js" $GITPATH/tinymce/editor_plugin_src.js
 #java -jar ~/bin/yuicompressor.jar --nomunge --preserve-semi -o "$GITPATH/tinymce/wpcf-select-box.js" $GITPATH/tinymce/wpcf-select-box_src.js
@@ -79,10 +96,22 @@ git commit -am "$COMMITMSG"
 echo "Tagging new version in git"
 git tag -a "$NEWVERSION" -m "Tagging version $NEWVERSION"
 
+merge beta develop
+
+if [ "$BETA" = 1 ] then
+	git checkout develop
+	echo "Beta version released."
+	exit 0;
+fi
+
+merge beta master
+
 echo "Pushing latest commit to origin, with tags"
 git push origin --all
 git push origin master --tags
 
+# ---------------------- now updating SVN -----------------------
+
 echo 
 echo "Creating local copy of SVN repo ..."
 svn co $SVNURL -N $SVNPATH
@@ -136,5 +165,6 @@ svn commit --username=$SVNUSER -m "Tagging version $NEWVERSION"
 echo "Removing temporary directory $SVNPATH"
 rm -fr $SVNPATH/
 
+git checkout develop
 echo "*** FIN ***"