1.1 --- a/test/remove.sh	Wed Feb 01 12:46:39 2012 +0000
     1.2 +++ b/test/remove.sh	Sat Jun 11 17:56:48 2016 +0100
     1.3 @@ -1,4 +1,9 @@
     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  fs_check_file()
    1.11  {
    1.12      if [ ! -e "$RAZOR_ROOT$1" ]; then 
    1.13 @@ -16,30 +21,30 @@
    1.14  }
    1.15  check_file()
    1.16  {
    1.17 -    ../src/razor list-files | grep -x "$1" > /dev/null
    1.18 +    $razor list-files | grep -x "$1" > /dev/null
    1.19      if [ $? -ne 0 ]; then
    1.20  	echo $1: Not in database >&2
    1.21 -	../src/razor list-files >&2
    1.22 +	$razor list-files >&2
    1.23  	exit 1
    1.24      fi
    1.25 -    ../src/razor list-files "$1" | grep -x "$1" > /dev/null
    1.26 +    $razor list-files "$1" | grep -x "$1" > /dev/null
    1.27      if [ $? -ne 0 ]; then
    1.28  	echo $1: Not seen by patterned list >&2
    1.29 -	../src/razor list-files "$1" >&2
    1.30 +	$razor list-files "$1" >&2
    1.31  	exit 1
    1.32      fi
    1.33 -    pkgs=`../src/razor list-file-packages "$1"`
    1.34 +    pkgs=`$razor list-file-packages "$1"`
    1.35      if [ -z "$pkgs" ]; then
    1.36  	echo $1: Not owned by any package >&2
    1.37 -	../src/razor list-file-packages "$1"
    1.38 +	$razor list-file-packages "$1"
    1.39  	exit 1
    1.40      fi
    1.41      for nevra in "$pkgs"; do
    1.42  	name=`echo $nevra | sed 's/\-.*$//'`
    1.43 -	../src/razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.44 +	$razor list-package-files "$name" | grep -x "$1" > /dev/null
    1.45  	if [ $? -ne 0 ]; then
    1.46  	    echo $1: Not in database for package $name >&2
    1.47 -	    ../src/razor list-package-files "$name"
    1.48 +	    $razor list-package-files "$name"
    1.49  	    exit 1
    1.50  	fi
    1.51      done
    1.52 @@ -47,7 +52,7 @@
    1.53  }
    1.54  check_no_file()
    1.55  {
    1.56 -    ../src/razor list-files | grep -x "$1" > /dev/null
    1.57 +    $razor list-files | grep -x "$1" > /dev/null
    1.58      if [ $? -eq 0 ]; then
    1.59  	echo $1: Still in database >&2
    1.60  	exit 1
    1.61 @@ -55,25 +60,25 @@
    1.62      fs_check_no_file $1
    1.63  }
    1.64  export RAZOR_ROOT=`mktemp -dt` || exit 1
    1.65 -../src/razor init || exit 1
    1.66 +$razor init || exit 1
    1.67  export YUM_URL="file://localhost/`pwd`"
    1.68 -../src/razor import-yum || exit 1
    1.69 -../src/razor install --relocate /usr=/opt zip || exit 1
    1.70 +$razor import-yum || exit 1
    1.71 +$razor install --relocate /usr=/opt zip || exit 1
    1.72  fs_check_file /opt/var/lib/zip/data.zap
    1.73 -../src/razor remove zip || exit 1
    1.74 +$razor remove zip || exit 1
    1.75  check_file /opt/bin/zap
    1.76  check_no_file /opt/bin/zip
    1.77  fs_check_no_file /opt/var/lib/zip/data.zap
    1.78 -../src/razor install --relocate /usr=/opt zsh || exit 1
    1.79 -../src/razor install --relocate /usr=/opt zsh2 || exit 1
    1.80 -../src/razor remove zsh || exit 1
    1.81 +$razor install --relocate /usr=/opt zsh || exit 1
    1.82 +$razor install --relocate /usr=/opt zsh2 || exit 1
    1.83 +$razor remove zsh || exit 1
    1.84  check_file /etc/zsh.conf
    1.85  check_no_file /opt/bin/zsh
    1.86  check_no_file /opt/var/lib/zsh/data.zip
    1.87  # Installing a package twice isn't handled very well at present
    1.88  # so just don't do it for now.
    1.89 -#../src/razor install --relocate /usr=/opt zsh2 || exit 1
    1.90 +#$razor install --relocate /usr=/opt zsh2 || exit 1
    1.91  fs_check_file /opt/var/lib/zip/data.zap
    1.92 -../src/razor remove zsh2 zip || exit 1
    1.93 +$razor remove zsh2 zip || exit 1
    1.94  fs_check_no_file /opt/var/lib/zip/data.zap
    1.95  rm -rf "$RAZOR_ROOT"