1.1 --- a/test/remove.sh	Fri Oct 17 09:57:19 2014 +0100
     1.2 +++ b/test/remove.sh	Fri Jul 08 15:54:49 2016 +0100
     1.3 @@ -6,28 +6,28 @@
     1.4  fi
     1.5  fs_check_file()
     1.6  {
     1.7 -    if [ ! -e "$RAZOR_ROOT$1" ]; then 
     1.8 +    if [ ! -e "$tmpdir$1" ]; then 
     1.9  	echo $1: Not in filesystem >&2
    1.10 -	ls -R "$RAZOR_ROOT" >&2
    1.11 +	ls -R "$tmpdir" >&2
    1.12  	exit 1
    1.13      fi
    1.14  }
    1.15  fs_check_no_file()
    1.16  {
    1.17 -    if [ -e "$RAZOR_ROOT$1" ]; then 
    1.18 +    if [ -e "$tmpdir$1" ]; then 
    1.19  	echo $1: Still in filesystem >&2
    1.20  	exit 1
    1.21      fi
    1.22  }
    1.23  check_file()
    1.24  {
    1.25 -    $razor list-files | grep -x "$1" > /dev/null
    1.26 +    $razor list-files | grep -F -x "$1" > /dev/null
    1.27      if [ $? -ne 0 ]; then
    1.28  	echo $1: Not in database >&2
    1.29  	$razor list-files >&2
    1.30  	exit 1
    1.31      fi
    1.32 -    $razor list-files "$1" | grep -x "$1" > /dev/null
    1.33 +    $razor list-files "$1" | grep -F -x "$1" > /dev/null
    1.34      if [ $? -ne 0 ]; then
    1.35  	echo $1: Not seen by patterned list >&2
    1.36  	$razor list-files "$1" >&2
    1.37 @@ -41,7 +41,7 @@
    1.38      fi
    1.39      for nevra in "$pkgs"; do
    1.40  	name=`echo $nevra | sed 's/\-.*$//'`
    1.41 -	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.42 +	$razor list-package-files "$name" | grep -F -x "$1" > /dev/null
    1.43  	if [ $? -ne 0 ]; then
    1.44  	    echo $1: Not in database for package $name >&2
    1.45  	    $razor list-package-files "$name"
    1.46 @@ -52,16 +52,17 @@
    1.47  }
    1.48  check_no_file()
    1.49  {
    1.50 -    $razor list-files | grep -x "$1" > /dev/null
    1.51 +    $razor list-files | grep -F -x "$1" > /dev/null
    1.52      if [ $? -eq 0 ]; then
    1.53  	echo $1: Still in database >&2
    1.54  	exit 1
    1.55      fi
    1.56      fs_check_no_file $1
    1.57  }
    1.58 -export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.59 +tmpdir=`mktemp -dt` || exit 1
    1.60 +export RAZOR_ROOT="file:$tmpdir"
    1.61  $razor init || exit 1
    1.62 -export YUM_URL="file://localhost/`pwd`"
    1.63 +export YUM_URL="file:`pwd`/base"
    1.64  $razor import-yum || exit 1
    1.65  $razor install --relocate /usr=/opt zip || exit 1
    1.66  fs_check_file /opt/var/lib/zip/data.zap
    1.67 @@ -81,4 +82,4 @@
    1.68  fs_check_file /opt/var/lib/zip/data.zap
    1.69  $razor remove zsh2 zip || exit 1
    1.70  fs_check_no_file /opt/var/lib/zip/data.zap
    1.71 -rm -rf "$RAZOR_ROOT"
    1.72 +rm -rf "$tmpdir"