uglyrobot · September 14, 2017 07:28 · Sep 22, 2015 · Jun 19, 2014 · Jun 14, 2014 · Jun 14, 2014
diff --git a/package-plugin b/package-plugin
@@ -13,7 +13,7 @@ fi
 
 #check that the plugin/theme version number matches what you provided. Note if multiple root php files have a "Version" header
 # line it will only grab the first it finds. Also if a theme and you have a php file in root with "Version" could cause mismatch.
-HEADERVERSION=`grep -m 1 --include={*.php,style.css} "^Version" * | awk -F' ' '{print $2}' | sed 's/[[:space:]]//g'`
+HEADERVERSION=`grep -m 1 --include={*.php,style.css} "Version" * | sed -e 's/^[ \t]*//' | awk -F' ' '{print $2}' | sed 's/[[:space:]]//g'`
 if [ "$VERSION" != "$HEADERVERSION" ]; then echo "Version doesn't match the plugin/theme header. Exiting...."; exit 2; fi
 
 #get the changelog message

diff --git a/package-plugin b/package-plugin
@@ -8,19 +8,20 @@ fi
 
 if [[ -z "$VERSION" ]] ; then
 	echo "Sorry, I need a version number!"
-	exit 0
+	exit 1
 fi
 
-#check that the plugin/theme version number matches what you provided
+#check that the plugin/theme version number matches what you provided. Note if multiple root php files have a "Version" header
+# line it will only grab the first it finds. Also if a theme and you have a php file in root with "Version" could cause mismatch.
 HEADERVERSION=`grep -m 1 --include={*.php,style.css} "^Version" * | awk -F' ' '{print $2}' | sed 's/[[:space:]]//g'`
-if [ "$VERSION" != "$HEADERVERSION" ]; then echo "Version doesn't match the plugin/theme header. Exiting...."; exit 1; fi
+if [ "$VERSION" != "$HEADERVERSION" ]; then echo "Version doesn't match the plugin/theme header. Exiting...."; exit 2; fi
 
 #get the changelog message
 echo "Enter your multiline changelog then ctrl-d on a new line when done:"
 MSG=$(cat)
 if [[ -z "$MSG" ]] ; then
 	echo "Sorry, I need a changelog for this release!"
-	exit 0
+	exit 3
 fi
 
 #get plugin slug/name from current directory

diff --git a/package-plugin b/package-plugin
@@ -15,13 +15,15 @@ fi
 HEADERVERSION=`grep -m 1 --include={*.php,style.css} "^Version" * | awk -F' ' '{print $2}' | sed 's/[[:space:]]//g'`
 if [ "$VERSION" != "$HEADERVERSION" ]; then echo "Version doesn't match the plugin/theme header. Exiting...."; exit 1; fi
 
+#get the changelog message
 echo "Enter your multiline changelog then ctrl-d on a new line when done:"
 MSG=$(cat)
 if [[ -z "$MSG" ]] ; then
 	echo "Sorry, I need a changelog for this release!"
 	exit 0
 fi
 
+#get plugin slug/name from current directory
 NAME=${PWD##*/}
 
 git tag -a $VERSION -m "$MSG"

diff --git a/package-plugin b/package-plugin
@@ -11,6 +11,10 @@ if [[ -z "$VERSION" ]] ; then
 	exit 0
 fi
 
+#check that the plugin/theme version number matches what you provided
+HEADERVERSION=`grep -m 1 --include={*.php,style.css} "^Version" * | awk -F' ' '{print $2}' | sed 's/[[:space:]]//g'`
+if [ "$VERSION" != "$HEADERVERSION" ]; then echo "Version doesn't match the plugin/theme header. Exiting...."; exit 1; fi
+
 echo "Enter your multiline changelog then ctrl-d on a new line when done:"
 MSG=$(cat)
 if [[ -z "$MSG" ]] ; then

diff --git a/package-plugin b/package-plugin
@@ -11,7 +11,7 @@ if [[ -z "$VERSION" ]] ; then
 	exit 0
 fi
 
-echo "Enter your multiline changelog and ctrl-d on a new line when done:"
+echo "Enter your multiline changelog then ctrl-d on a new line when done:"
 MSG=$(cat)
 if [[ -z "$MSG" ]] ; then
 	echo "Sorry, I need a changelog for this release!"

diff --git a/plugin-package.sh → package-plugin b/plugin-package.sh → package-plugin
diff --git a/plugin-package.sh b/plugin-package.sh
@@ -22,5 +22,5 @@ NAME=${PWD##*/}
 
 git tag -a $VERSION -m "$MSG"
 git push origin $VERSION
-git-archive-all --prefix $NAME/ ~/Desktop/$NAME-$VERSION.zip
+git-archive-all --force-submodules --prefix $NAME/ ~/Desktop/$NAME-$VERSION.zip
 echo "Tagged in bitbucket and Packaged as $NAME-$VERSION.zip on your desktop."
diff --git a/plugin-package.sh b/plugin-package.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+if [[ $# -eq 0 ]] ; then
+    echo "Please enter a version number:"
+    read VERSION
+else
+	VERSION=$1
+fi
+
+if [[ -z "$VERSION" ]] ; then
+	echo "Sorry, I need a version number!"
+	exit 0
+fi
+
+echo "Enter your multiline changelog and ctrl-d on a new line when done:"
+MSG=$(cat)
+if [[ -z "$MSG" ]] ; then
+	echo "Sorry, I need a changelog for this release!"
+	exit 0
+fi
+
+NAME=${PWD##*/}
+
+git tag -a $VERSION -m "$MSG"
+git push origin $VERSION
+git-archive-all --prefix $NAME/ ~/Desktop/$NAME-$VERSION.zip
+echo "Tagged in bitbucket and Packaged as $NAME-$VERSION.zip on your desktop."