Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
randyhoyt committed Jan 12, 2013
2 parents 1a740fa + 9869e99 commit b1e23cd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 58 deletions.
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: randyjensen,randyhoyt
Tags: openphoto,media
Requires at least: 3.2
Tested up to: 3.5
Stable tag: %VERSION_NUMBER%
Stable tag: 0.9.5%VERSION_NUMBER%

Insert photos from your OpenPhoto installation into your WordPress content through the media manager.

Expand Down
12 changes: 6 additions & 6 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ read NEWVERSION

# Update version number, tag the version, push everything to master.
echo "Tagging new version in Git."
CURRENTVERSION=`grep "^Stable tag:" $GITPATH/readme.txt | awk -F' ' '{print $NF}'`
sed -c -i 's/Stable tag: '$CURRENTVERSION'/Stable tag: '${NEWVERSION}'/g' ${GITPATH}/readme.txt
CURRENTVERSION=`grep "^Stable tag:" $GITPATH/REAMDE.txt | awk -F' ' '{print $NF}'`
sed -c -i 's/Stable tag: '$CURRENTVERSION'/Stable tag: '${NEWVERSION}'/g' ${GITPATH}/README.txt
CURRENTVERSION=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
sed -c -i 's/Version: '$CURRENTVERSION'/Version: '${NEWVERSION}'/g' ${GITPATH}/${MAINFILE}
git add readme.txt
git add README.txt
git add ${GITPATH}/${MAINFILE}
git commit -m "Tagging version $NEWVERSION"
git tag -a "$NEWVERSION" -m "Tagging version $NEWVERSION"
Expand Down Expand Up @@ -67,11 +67,11 @@ svn commit --username=$SVNUSER -m "Committing version $NEWVERSIONTXT"


cd $GITPATH
NEWVERSION=`grep "^Stable tag:" $GITPATH/readme.txt | awk -F' ' '{print $NF}'`
sed -c -i 's/Stable tag: '$NEWVERSION'/Stable tag: %VERSION_NUMBER%/g' ${GITPATH}/readme.txt
NEWVERSION=`grep "^Stable tag:" $GITPATH/README.txt | awk -F' ' '{print $NF}'`
sed -c -i 's/Stable tag: '$NEWVERSION'/Stable tag: %VERSION_NUMBER%/g' ${GITPATH}/README.txt
NEWVERSION=`grep "^Version:" $GITPATH/$MAINFILE | awk -F' ' '{print $NF}'`
sed -c -i 's/Version: '$NEWVERSION'/Version: %VERSION_NUMBER%/g' ${GITPATH}/${MAINFILE}
git add readme.txt
git add README.txt
git add ${GITPATH}/${MAINFILE}
git commit -m "Tagging version $NEWVERSION"
git push
51 changes: 0 additions & 51 deletions readme.txt

This file was deleted.

0 comments on commit b1e23cd

Please sign in to comment.