diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-15 21:43:20 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-16 08:32:44 +0100 |
commit | 5790f5bfafb12cc2ed9365461bf66e0fdfde7150 (patch) | |
tree | 3536d84023161f43882c4dd7df54f51f17ebe2f7 /inspector | |
parent | 0108d7861d4cc9a1f0d87d89080d1be7750e54b5 (diff) | |
download | libguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.tar.gz libguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.tar.xz libguestfs-5790f5bfafb12cc2ed9365461bf66e0fdfde7150.zip |
Remove ad-hoc run*locally scripts, replace with './run'
Remove all the run*locally scripts and replace with a single top level
./run shell script.
Diffstat (limited to 'inspector')
-rw-r--r-- | inspector/Makefile.am | 10 | ||||
-rwxr-xr-x | inspector/run-inspector-locally | 51 |
2 files changed, 5 insertions, 56 deletions
diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 435ba872..8024f98a 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -33,7 +33,6 @@ EXAMPLE_XML = \ example-windows-xp-cd.xml EXTRA_DIST = \ - run-inspector-locally \ virt-inspector.pod CLEANFILES = stamp-virt-inspector.pod @@ -101,17 +100,18 @@ endif example-debian.xml: rm -f $@ $@-t - ./run-inspector-locally ../images/debian.img > $@-t + ../run $(builddir)/virt-inspector ../images/debian.img > $@-t mv $@-t $@ example-fedora.xml: rm -f $@ $@-t - ./run-inspector-locally ../images/fedora.img > $@-t + ../run $(builddir)/virt-inspector ../images/fedora.img > $@-t mv $@-t $@ example-ubuntu.xml: rm -f $@ $@-t - ./run-inspector-locally ../images/ubuntu.img > $@-t + ../run $(builddir)/virt-inspector ../images/ubuntu.img > $@-t mv $@-t $@ example-windows.xml: rm -f $@ $@-t - ./run-inspector-locally ../images/windows.img | fgrep -v '<uuid>' > $@-t + ../run $(builddir)/virt-inspector ../images/windows.img | \ + fgrep -v '<uuid>' > $@-t mv $@-t $@ diff --git a/inspector/run-inspector-locally b/inspector/run-inspector-locally deleted file mode 100755 index e5c9f4a3..00000000 --- a/inspector/run-inspector-locally +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/perl -# libguestfs inspector -# Copyright (C) 2009 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# This script sets up the environment so you can run virt-inspector in place -# without needing to do 'make install' first. You can also run virt-inspector -# by creating a symlink to this script and putting it in your path. -# -# Use it like this: -# ./run-inspector-locally [usual virt-inspector args ...] - -use strict; -use warnings; - -use File::Basename qw(dirname); -use File::Spec; -use Cwd qw(abs_path); - -my $path = $0; - -# Follow symlinks until we get to the real file -while(-l $path) { - my $link = readlink($path) or die "readlink: $path: $!"; - if(File::Spec->file_name_is_absolute($link)) { - $path = $link; - } else { - $path = File::Spec->catfile(dirname($path), $link); - } -} - -# Get the absolute path of the parent directory -$path = abs_path(dirname($path).'/..'); - -$ENV{LD_LIBRARY_PATH} = $path.'/src/.libs'; -$ENV{LIBGUESTFS_PATH} = $path.'/appliance'; - -exec($path.'/inspector/virt-inspector', @ARGV); |