tests: support spaces in path and TMPDIR

[apt.git] / test / integration / test-apt-extracttemplates

diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
index 276862464096bafecb6737947505218daaa90266..b299d85f4e9a7e4b69440d465f43428da055e840 100755 (executable)
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture 'amd64'
 
 setupenvironment
 configarchitecture 'amd64'


@@ -10,7 +10,7 @@ configarchitecture 'amd64'
 # apt-extracttemplates needs this
 insertinstalledpackage 'pkg-with-template' 'amd64' '1.0'
 
 # apt-extracttemplates needs this
 insertinstalledpackage 'pkg-with-template' 'amd64' '1.0'
 

-# build a simple package that contains a config and a tempalte
+# build a simple package that contains a config and a template

 mkdir -p DEBIAN
 CONFIG_STR="#!/bin/sh
 random shell stuff
 mkdir -p DEBIAN
 CONFIG_STR="#!/bin/sh
 random shell stuff


@@ -35,7 +35,7 @@ Description: Some bar var
        OUT='rootdir/tmp/testsuccess.output'
        testequal "$1" cut -f1 -d' ' $OUT
        if [ -n "$2" ]; then
        OUT='rootdir/tmp/testsuccess.output'
        testequal "$1" cut -f1 -d' ' $OUT
        if [ -n "$2" ]; then

-               testequal '' cut -f2 -d' ' $OUT
+               testequal '' cut -s -f2 -d' ' $OUT

        else
                testequal '1.0' cut -f2 -d' ' $OUT
        fi
        else
                testequal '1.0' cut -f2 -d' ' $OUT
        fi