1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
|
--- a/rmagic.pl
+++ b/rmagic.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -I/usr/share/rmagic
###################################################################
# Report Magic
#
@@ -49,46 +49,7 @@
use File::Basename;
use File::Path;
- # - Find execution directory
- # This will fail if it is in a directory where it doesn't have access
- # all the way to to root. If this is the case, then fall back to using
- # relative paths.
- eval( 'require FindBin' );
- if( $@ || ! $FindBin::RealBin) {
- print $@;
- # Copied from FindBin.pm
- my $script = $0;
-
- # Workaround for Win32 not finding 'rmagic' when looking for 'rmagic.exe'
- my $IsWin32 = $^O eq 'MSWin32';
- if( $IsWin32 && $script !~ m!\.[^\.]+$! ) {
- $script .= '.exe' if -e "$script.exe";
- } # end if
-
- # Rest from FindBin.pm
- if ($^O eq 'VMS') {
- my ($Bin,$Script) = VMS::Filespec::rmsexpand($0) =~ /(.*\])(.*)/s;
- $RealBin = $Bin;
- } else {
- unless( ($script =~ m!/! || ($IsWin32 && $script =~ m!\\!)) && -f $script ) {
- my $dir;
- foreach $dir (File::Spec->path) {
- my $scr = File::Spec->catfile($dir, $script);
- if( -r $scr && (!$IsWin32 || -x _) ) {
- $script = $scr;
- $script = $0 if -f $0 && (!-T $script);
- last;
- } # end if
- } # end foreach
- } # end unless
- die("Cannot find current script '$0'") unless(-f $script);
- my($Script,$Bin) = fileparse($script);
- $RealBin = $Bin;
- } # end if
- } else {
- $RealBin = $FindBin::RealBin;
- } # end if
- $RealBin = "." unless $RealBin;
+ $RealBin = '/usr/share/rmagic';
} # end BEGIN
@@ -103,7 +64,7 @@
# - Add execution directory to lib path, resolving symbolic refs
-use lib $RealBin;
+#use lib $RealBin; # Debian use -I instead (and has the binary elsewhere)
# - Read INI files
use Config::IniFiles;
|