From 922e4cef37df1ab1cc1d5d862d67cb3400057493 Mon Sep 17 00:00:00 2001 From: Scott Walters Date: Thu, 2 Dec 2010 18:18:50 -0500 Subject: [PATCH] Take a --configFile of either absolute path or relative to etc. Maybe. --- sbin/installClass.pl | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sbin/installClass.pl b/sbin/installClass.pl index a8cbd0737..886a3f7cf 100755 --- a/sbin/installClass.pl +++ b/sbin/installClass.pl @@ -15,17 +15,17 @@ use strict; use File::Basename (); use File::Spec; +use Getopt::Long; +use Pod::Usage; +use WebGUI::Pluggable; +use WebGUI::Session; + my $webguiRoot; BEGIN { $webguiRoot = File::Spec->rel2abs(File::Spec->catdir(File::Basename::dirname(__FILE__), File::Spec->updir)); unshift @INC, File::Spec->catdir($webguiRoot, 'lib'); } -use Getopt::Long; -use Pod::Usage; -use WebGUI::Pluggable; -use WebGUI::Session; - $|++; # Get options @@ -51,11 +51,15 @@ pod2usage( -verbose => 2 ) pod2usage("$0: Must specify a configFile") if !$configFile; -die "Config file '$configFile' does not exist!\n" - if !-f '../etc/' . $configFile; +if( ! -e $configFile ) { + my $possible_configFile = File::Spec->catfile($webguiRoot, 'etc', $configFile); + $configFile = $possible_configFile if -e $possible_configFile; +} + +die "Config file '$configFile' does not exist!\n" if ! -e $configFile; # Open the session -my $session = WebGUI::Session->open( "..", $configFile ); +my $session = WebGUI::Session->open( $webguiRoot, $configFile ); $session->user( { userId => 3 } ); # Install or uninstall the asset