On Wed, 9 Sep 2015, Doug Goldstein wrote:
> Signed-off-by: Doug Goldstein
Reviewed-by: Stefano Stabellini
> lib/git-checkout.sh | 26 +-
> scripts/mkdeb | 22 +++---
> 2 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/lib/git-checkout.sh b/lib/git-checkout.sh
> index 2ca8f25..d462453 100755
> --- a/lib/git-checkout.sh
> +++ b/lib/git-checkout.sh
> @@ -3,8 +3,8 @@
> function git-checkout() {
> if [[ $# -lt 3 ]]
> then
> - echo "Usage: $0 "
> - exit 1
> +echo "Usage: $0 "
> +exit 1
> fi
>
> TREE=$1
> @@ -15,17 +15,17 @@ function git-checkout() {
>
> if [[ ! -d $DIR-remote ]]
> then
> - rm -rf $DIR-remote $DIR-remote.tmp
> - mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp
> - $GIT clone $TREE $DIR-remote.tmp
> - if [[ "$TAG" ]]
> - then
> - cd $DIR-remote.tmp
> - $GIT branch -D dummy >/dev/null 2>&1 ||:
> - $GIT checkout -b dummy $TAG
> - cd ..
> - fi
> - mv $DIR-remote.tmp $DIR-remote
> +rm -rf $DIR-remote $DIR-remote.tmp
> +mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp
> +$GIT clone $TREE $DIR-remote.tmp
> +if [[ "$TAG" ]]
> +then
> +cd $DIR-remote.tmp
> +$GIT branch -D dummy >/dev/null 2>&1 ||:
> +$GIT checkout -b dummy $TAG
> +cd ..
> +fi
> +mv $DIR-remote.tmp $DIR-remote
> fi
> rm -f $DIR
> ln -sf $DIR-remote $DIR
> diff --git a/scripts/mkdeb b/scripts/mkdeb
> index 5259f1e..3796300 100755
> --- a/scripts/mkdeb
> +++ b/scripts/mkdeb
> @@ -9,8 +9,8 @@ set -e
>
> if [[ -z "$1" ]]
> then
> - echo "usage: $0 package_name"
> - exit 1
> +echo "usage: $0 package_name"
> +exit 1
> fi
>
> name=$1
> @@ -19,13 +19,13 @@ cd "$BASEDIR"
>
> # map the architecture, if necessary
> case "$RAISIN_ARCH" in
> - x86_32|x86_32p) arch=i386 ;;
> - x86_64) arch=amd64 ;;
> - arm32) arch=armhf ;;
> - arm64) arch=$RAISIN_ARCH;;
> - *) echo "Unknown ARCH $RAISIN_ARCH" >&2
> - exit 1
> - ;;
> +x86_32|x86_32p) arch=i386 ;;
> +x86_64) arch=amd64 ;;
> +arm32) arch=armhf ;;
> +arm64) arch=$RAISIN_ARCH;;
> +*) echo "Unknown ARCH $RAISIN_ARCH" >&2
> + exit 1
> + ;;
> esac
>
> # Prepare the directory to package
> @@ -42,8 +42,8 @@ cp config raise deb/opt/raisin
> # Debian doesn't use /usr/lib64 for 64-bit libraries
> if [[ -d deb/usr/lib64 ]]
> then
> - cp -a deb/usr/lib64/* deb/usr/lib/
> - rm -rf deb/usr/lib64
> +cp -a deb/usr/lib64/* deb/usr/lib/
> +rm -rf deb/usr/lib64
> fi
>
> # Fill in the debian boilerplate
> --
> 2.4.6
>
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel