1.1 --- a/test/named-root.sh	Wed Apr 22 15:09:17 2009 +0100
     1.2 +++ b/test/named-root.sh	Thu Nov 13 11:30:27 2014 +0000
     1.3 @@ -1,36 +1,41 @@
     1.4  #!/bin/sh
     1.5 +if [ $# -gt 0 ]; then
     1.6 +    razor="$1"
     1.7 +else
     1.8 +    razor=../src/razor
     1.9 +fi
    1.10  check_file()
    1.11  {
    1.12 -    ../src/razor list-files | grep -x "$1" > /dev/null
    1.13 +    $razor list-files | grep -x "$1" > /dev/null
    1.14      if [ $? -ne 0 ]; then
    1.15  	echo $1: Not in database >&2
    1.16 -	../src/razor list-files >&2
    1.17 +	$razor list-files >&2
    1.18  	exit 1
    1.19      fi
    1.20 -    ../src/razor list-files c: | grep -x "$1" > /dev/null
    1.21 +    $razor list-files c: | grep -x "$1" > /dev/null
    1.22      if [ $? -ne 0 ]; then
    1.23  	echo $1: Not seen by named root list >&2
    1.24 -	../src/razor list-files c: >&2
    1.25 +	$razor list-files c: >&2
    1.26  	exit 1
    1.27      fi
    1.28 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    1.29 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    1.30      if [ $? -ne 0 ]; then
    1.31  	echo $1: Not seen by patterned list >&2
    1.32 -	../src/razor list-files "$1" >&2
    1.33 +	$razor list-files "$1" >&2
    1.34  	exit 1
    1.35      fi
    1.36 -    pkgs=`../src/razor list-file-packages "$1"`
    1.37 +    pkgs=`$razor list-file-packages "$1"`
    1.38      if [ -z "$pkgs" ]; then
    1.39  	echo $1: Not owned by any package >&2
    1.40 -	../src/razor list-file-packages "$1"
    1.41 +	$razor list-file-packages "$1"
    1.42  	exit 1
    1.43      fi
    1.44      for nevra in "$pkgs"; do
    1.45  	name=`echo $nevra | sed 's/\-.*$//'`
    1.46 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.47 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.48  	if [ $? -ne 0 ]; then
    1.49  	    echo $1: Not in database for package $name >&2
    1.50 -	    ../src/razor list-package-files "$name"
    1.51 +	    $razor list-package-files "$name"
    1.52  	    exit 1
    1.53  	fi
    1.54      done
    1.55 @@ -43,11 +48,11 @@
    1.56  export RAZOR_ROOT="$tmpdir/x-"
    1.57  mkdir -p "$tmpdir/x-/var/lib" "$tmpdir/x-c:"
    1.58  export RAZOR_NO_ROOT_NAME_CHECKS=1
    1.59 -../src/razor init || exit 1
    1.60 +$razor init || exit 1
    1.61  export YUM_URL="file://localhost/`pwd`"
    1.62 -../src/razor import-yum || exit 1
    1.63 -../src/razor install --relocate /usr=c:/test zap || exit 1
    1.64 -../src/razor install --relocate /usr=c:/test zip || exit 1
    1.65 +$razor import-yum || exit 1
    1.66 +$razor install --relocate /usr=c:/test zap || exit 1
    1.67 +$razor install --relocate /usr=c:/test zip || exit 1
    1.68  check_file c:/test/bin/zap
    1.69  check_file c:/test/bin/zip
    1.70  rm -rf "$tmpdir"