package.sh: cleaning up formatting

No logic changes made. Tested no syntax errors added.
This commit is contained in:
John Kinsella 2014-02-17 10:51:34 -08:00
parent 9dd57c22b0
commit dda47dbd67

View File

@ -31,51 +31,44 @@ function usage() {
} }
function packaging() { function packaging() {
CWD=`pwd`
CWD=`pwd` RPMDIR=$CWD/../../dist/rpmbuild
RPMDIR=$CWD/../../dist/rpmbuild PACK_PROJECT=cloudstack
PACK_PROJECT=cloudstack if [ -n "$1" ] ; then
if [ -n "$1" ] ; then
DEFOSSNOSS="-D_ossnoss $packageval" DEFOSSNOSS="-D_ossnoss $packageval"
fi fi
VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'`
VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'` if echo $VERSION | grep SNAPSHOT ; then
if echo $VERSION | grep SNAPSHOT ; then
REALVER=`echo $VERSION | cut -d '-' -f 1` REALVER=`echo $VERSION | cut -d '-' -f 1`
DEFVER="-D_ver $REALVER" DEFVER="-D_ver $REALVER"
DEFPRE="-D_prerelease 1" DEFPRE="-D_prerelease 1"
DEFREL="-D_rel SNAPSHOT" DEFREL="-D_rel SNAPSHOT"
else else
REALVER=`echo $VERSION` REALVER=`echo $VERSION`
DEFVER="-D_ver $REALVER" DEFVER="-D_ver $REALVER"
DEFREL="-D_rel 1" DEFREL="-D_rel 1"
fi fi
mkdir -p $RPMDIR/SPECS mkdir -p $RPMDIR/SPECS
mkdir -p $RPMDIR/BUILD mkdir -p $RPMDIR/BUILD
mkdir -p $RPMDIR/RPMS mkdir -p $RPMDIR/RPMS
mkdir -p $RPMDIR/SRPMS mkdir -p $RPMDIR/SRPMS
mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x )
(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) cp cloud.spec $RPMDIR/SPECS
(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
cp cloud.spec $RPMDIR/SPECS (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec) exit
exit
} }
if [ $# -lt 1 ] ; then if [ $# -lt 1 ] ; then
packaging packaging
elif [ $# -gt 0 ] ; then elif [ $# -gt 0 ] ; then
SHORTOPTS="hp:" SHORTOPTS="hp:"
LONGOPTS="help,pack:" LONGOPTS="help,pack:"
@ -110,7 +103,6 @@ elif [ $# -gt 0 ] ; then
;; ;;
esac esac
done done
else else
echo "Incorrect choice. Nothing to do." >&2 echo "Incorrect choice. Nothing to do." >&2
echo "Please, execute ./package.sh --help for more help" echo "Please, execute ./package.sh --help for more help"