package.sh: cleaning up formatting

No logic changes made. Tested no syntax errors added.

packaging/centos63/package.sh

@@ -17,101 +17,93 @@
 # under the License.
 
 function usage() {
- echo ""
+    echo ""
- echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]"
+    echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]"
- echo ""
+    echo ""
- echo "The commonly used Arguments are:"
+    echo "The commonly used Arguments are:"
- echo "oss|OSS             To package with only redistributable libraries (default)"
+    echo "oss|OSS             To package with only redistributable libraries (default)"
- echo "noredist|NOREDIST   To package with non-redistributable libraries"
+    echo "noredist|NOREDIST   To package with non-redistributable libraries"
- echo ""
+    echo ""
- echo "Examples: ./package.sh -p|--pack oss|OSS"
+    echo "Examples: ./package.sh -p|--pack oss|OSS"
- echo "          ./package.sh -p|--pack noredist|NOREDIST"
+    echo "          ./package.sh -p|--pack noredist|NOREDIST"
- echo "          ./package.sh (Default OSS)"
+    echo "          ./package.sh (Default OSS)"
- exit 1
+    exit 1
 }
 
 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]\.'`
+    if echo $VERSION | grep SNAPSHOT ; then
+        REALVER=`echo $VERSION | cut -d '-' -f 1`
+        DEFVER="-D_ver $REALVER"
+        DEFPRE="-D_prerelease 1"
+        DEFREL="-D_rel SNAPSHOT"
+    else
+        REALVER=`echo $VERSION`
+        DEFVER="-D_ver $REALVER"
+        DEFREL="-D_rel 1"
+    fi
 
-VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'`
+    mkdir -p $RPMDIR/SPECS
-if echo $VERSION | grep SNAPSHOT ; then
+    mkdir -p $RPMDIR/BUILD
-  REALVER=`echo $VERSION | cut -d '-' -f 1`
+    mkdir -p $RPMDIR/RPMS
-  DEFVER="-D_ver $REALVER"
+    mkdir -p $RPMDIR/SRPMS
-  DEFPRE="-D_prerelease 1"
+    mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
-  DEFREL="-D_rel SNAPSHOT"
-else
-  REALVER=`echo $VERSION`
-  DEFVER="-D_ver $REALVER"
-  DEFREL="-D_rel 1"
-fi
 
-mkdir -p $RPMDIR/SPECS
+    (cd ../../; tar -c --exclude .git --exclude dist  .  | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x )
-mkdir -p $RPMDIR/BUILD
+    (cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
-mkdir -p $RPMDIR/RPMS
-mkdir -p $RPMDIR/SRPMS
-mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
 
+    cp cloud.spec $RPMDIR/SPECS
 
-(cd ../../; tar -c --exclude .git --exclude dist  .  | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x )
+    (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
-(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
 
-cp cloud.spec $RPMDIR/SPECS
+    exit
-
-(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
-
-exit
 }
 
-
 if [ $# -lt 1 ] ; then
-
+    packaging
-	packaging
-
 elif [ $# -gt 0 ] ; then
+    SHORTOPTS="hp:"
+    LONGOPTS="help,pack:"
 
-	SHORTOPTS="hp:"
+    ARGS=$(getopt -s bash -u -a --options $SHORTOPTS  --longoptions $LONGOPTS --name $0 -- "$@" )
-	LONGOPTS="help,pack:"
+    eval set -- "$ARGS"
-
-	ARGS=$(getopt -s bash -u -a --options $SHORTOPTS  --longoptions $LONGOPTS --name $0 -- "$@" )
-	eval set -- "$ARGS"
-
-	while [ $# -gt 0 ] ; do
-	case "$1" in
-	-h | --help)
-		usage
-		exit 0
-		;;
-	-p | --pack)
-		echo "Doing CloudStack Packaging ....."
-		packageval=$2
-		if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then
-			packaging
-		elif [ "$packageval" == "noredist" -o "$packageval" == "NOREDIST" ] ; then
-			packaging noredist
-		else
-			echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details."
-			exit 1
-		fi
-		;;
-	-)
-		echo "Unrecognized option..."
-		usage
-		exit 1
-		;;
-	*)
-		shift
-		;;
-	esac
-	done
 
+    while [ $# -gt 0 ] ; do
+        case "$1" in
+            -h | --help)
+            usage
+            exit 0
+            ;;
+        -p | --pack)
+            echo "Doing CloudStack Packaging ....."
+            packageval=$2
+            if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then
+                packaging
+            elif [ "$packageval" == "noredist" -o "$packageval" == "NOREDIST" ] ; then
+                packaging noredist
+            else
+                echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details."
+                exit 1
+            fi
+            ;;
+        -)
+            echo "Unrecognized option..."
+            usage
+            exit 1
+            ;;
+        *)
+            shift
+            ;;
+        esac
+    done
 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"
 fi