1.1 --- a/test/relocate.sh	Fri Oct 17 09:57:19 2014 +0100
     1.2 +++ b/test/relocate.sh	Mon Jul 11 16:50:21 2016 +0100
     1.3 @@ -1,4 +1,5 @@
     1.4  #!/bin/sh
     1.5 +set -x
     1.6  if [ $# -gt 0 ]; then
     1.7      razor="$1"
     1.8  else
     1.9 @@ -6,19 +7,20 @@
    1.10  fi
    1.11  check_file()
    1.12  {
    1.13 -    $razor list-files | grep -x "$1" > /dev/null
    1.14 +    $razor list-files | grep -F -x "$1" > /dev/null
    1.15      if [ $? -ne 0 ]; then
    1.16  	echo $1: Not in database >&2
    1.17  	exit 1
    1.18      fi
    1.19 -    if [ ! -e "$RAZOR_ROOT$1" ]; then 
    1.20 +    if [ ! -e "$tmpdir$1" ]; then 
    1.21  	echo $1: Not in filesystem >&2
    1.22  	exit 1
    1.23      fi
    1.24  }
    1.25 -export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.26 +tmpdir=`mktemp -dt` || exit 1
    1.27 +export RAZOR_ROOT="file:$tmpdir"
    1.28  $razor init || exit 1
    1.29 -export YUM_URL="file://localhost/`pwd`"
    1.30 +export YUM_URL="file:`pwd`/base"
    1.31  $razor import-yum || exit 1
    1.32  $razor install zap || exit 1
    1.33  $razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1
    1.34 @@ -26,4 +28,4 @@
    1.35  check_file /usr/bin/zap
    1.36  check_file /opt/bin/zip
    1.37  check_file /opt/bin/zsh
    1.38 -rm -rf "$RAZOR_ROOT"
    1.39 +rm -rf "$tmpdir"