Putting 4.2.0 on top of 4.0.17

[usit-rt.git] / sbin / rt-attributes-viewer

diff --git a/sbin/rt-attributes-viewer b/sbin/rt-attributes-viewer
index ca2740e4bde0d7839af0ac9e5de33491afb11fbc..ec67be9bb57f428cbd16f0f72345af94c3a707b4 100755 (executable)
--- a/sbin/rt-attributes-viewer
+++ b/sbin/rt-attributes-viewer
@@ -50,27 +50,20 @@ use strict;
 use warnings;
 
 # fix lib paths, some may be relative
-BEGIN {
+BEGIN { # BEGIN RT CMD BOILERPLATE
     require File::Spec;
+    require Cwd;
     my @libs = ("lib", "local/lib");
     my $bin_path;
 
     for my $lib (@libs) {
         unless ( File::Spec->file_name_is_absolute($lib) ) {
-            unless ($bin_path) {
-                if ( File::Spec->file_name_is_absolute(__FILE__) ) {
-                    $bin_path = ( File::Spec->splitpath(__FILE__) )[1];
-                }
-                else {
-                    require FindBin;
-                    no warnings "once";
-                    $bin_path = $FindBin::Bin;
-                }
-            }
+            $bin_path ||= ( File::Spec->splitpath(Cwd::abs_path(__FILE__)) )[1];
             $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
         }
         unshift @INC, $lib;
     }
+
 }
 
 use Getopt::Long;