From: Doug Goldstein Date: Wed, 9 Sep 2015 15:08:25 +0000 (-0500) Subject: Delete dangling white space X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eb7a497cdcd97a67a73f6ace319786996bd0b321;p=raisin.git Delete dangling white space Signed-off-by: Doug Goldstein Reviewed-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- diff --git a/lib/commands.sh b/lib/commands.sh index a79611e..be445a7 100755 --- a/lib/commands.sh +++ b/lib/commands.sh @@ -50,12 +50,12 @@ function install-builddep() { function build() { check-builddep - + mkdir -p "$INST_DIR" &>/dev/null # build and install under $DESTDIR for_each_component build - + build_package xen-system } diff --git a/lib/common-functions.sh b/lib/common-functions.sh index c52174a..c222ce3 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -20,9 +20,9 @@ function common_init() { export PREFIX=${PREFIX-/usr} export INST_DIR=${DESTDIR-dist} export PREPEND="[raisin]" - + INST_DIR=`readlink -f $INST_DIR` - + # execution if [[ $EUID -eq 0 ]] then @@ -62,7 +62,7 @@ function get_components() { COMPONENTS="$ENABLED_COMPONENTS" fi - if [[ -z "$COMPONENTS" ]] + if [[ -z "$COMPONENTS" ]] then local component for component in `cat "$BASEDIR"/components/series` @@ -85,7 +85,7 @@ function get_tests() { TESTS="$ENABLED_TESTS" fi - if [[ -z "$TESTS" ]] + if [[ -z "$TESTS" ]] then local t for t in `cat "$BASEDIR"/tests/series` @@ -380,7 +380,7 @@ function init_tests() { else error_echo "I don't know distro $DISTRO. It might be missing packages." fi - + if [[ -n "${missing[@]}" ]] then verbose_echo "Installing ${missing[@]}" diff --git a/scripts/mkdeb b/scripts/mkdeb index dbd92bd..5259f1e 100755 --- a/scripts/mkdeb +++ b/scripts/mkdeb @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# mkdeb: package $INST_DIR output in a .deb +# mkdeb: package $INST_DIR output in a .deb # # Takes 1 argument: the package name # It relies on RAISIN_ARCH and INST_DIR being set correctly @@ -8,10 +8,10 @@ set -e if [[ -z "$1" ]] -then +then echo "usage: $0 package_name" exit 1 -fi +fi name=$1 @@ -41,7 +41,7 @@ cp config raise deb/opt/raisin # Debian doesn't use /usr/lib64 for 64-bit libraries if [[ -d deb/usr/lib64 ]] -then +then cp -a deb/usr/lib64/* deb/usr/lib/ rm -rf deb/usr/lib64 fi diff --git a/scripts/mkrpm b/scripts/mkrpm index 7965c0c..88997c6 100755 --- a/scripts/mkrpm +++ b/scripts/mkrpm @@ -8,10 +8,10 @@ set -e if [[ -z "$1" ]] -then +then echo "usage: $0 package_name" exit 1 -fi +fi name="$1" diff --git a/tests/busybox-hvm b/tests/busybox-hvm index 2b6c1dd..51e9e19 100755 --- a/tests/busybox-hvm +++ b/tests/busybox-hvm @@ -16,17 +16,17 @@ function busybox-hvm-test() { echo $PREPEND busybox hvm test only valid on x86 exit 0 fi - + TMPDIR=`mktemp -d` cd $TMPDIR - + allocate_disk busybox-vm-disk $((20*1024*1024)) LOOP=`create_loop busybox-vm-disk` LOOP_P0=`create_one_partition busybox-vm-disk` busybox_rootfs $LOOP_P0 busybox_network_init $LOOP_P0 bootloader_init $LOOP $LOOP_P0 - + cat >busybox-hvm <busybox-pv <