Added auto-location of config file to scripts tool-scripts

diff --git a/guc-clients/add_apikey.pl b/guc-clients/add_apikey.pl
index a543c23023414ed0c6be6c081db88481e4c7ac15..ce303bdadb9c54d0af080302667552d4c5eb3a30 100755 (executable)
--- a/guc-clients/add_apikey.pl
+++ b/guc-clients/add_apikey.pl
@@ -13,13 +13,21 @@ my $level = "";
 my $keyfile ="";
 my $api_base  = "";
 my $api_key   = "";
-my $configfile;
+my $configfile = undef;
 
 my $config = AppConfig->new( { CREATE => 1 } );
 
 $config->define("api_url=s");
 $config->define("api_keyfile=s");
 
+foreach ( 
+       "/usr/local/etc/hermes/hermes_config",
+       "/usr/local/etc/hermes/config",
+       "/etc/hermes/config",
+       $ENV{"HOME"} . "/.hermes/config",
+       $ENV{"HOME"} . "/.hermes_config",
+) { $configfile = $_ if ( -f $_ ); }
+
 GetOptions(
        "help"          => \$help,
        "host=s"        => \$host_ip,

diff --git a/guc-clients/addsipuser b/guc-clients/addsipuser
index cacbad2fd8df8339b2a03ad60fb91a0f80751e32..00eae4bdbef969f1523659e74129ea8e4cd77e30 100755 (executable)
--- a/guc-clients/addsipuser
+++ b/guc-clients/addsipuser
@@ -18,7 +18,7 @@ my $api_key;
 
 my $help;
 my $username;
-my $configfile;
+my $configfile = undef;
 my $dryrun = 0;
 my ($g_ua, $session, $api_key, $auth_key, $data, $domain);
 my ($user, $displayname, $phone, $mail, $sipuser, $linetext);
@@ -37,6 +37,14 @@ $config->define("default_domain=s");
 #TODO: Move this to config file.
 $config->default_domain("hig.no");
 
+foreach ( 
+       "/usr/local/etc/hermes/hermes_config",
+       "/usr/local/etc/hermes/config",
+       "/etc/hermes/config",
+       $ENV{"HOME"} . "/.hermes/config",
+       $ENV{"HOME"} . "/.hermes_config",
+) { $configfile = $_ if ( -f $_ ); }
+
 GetOptions(
        "help"          => \$help,
        "username=s"    => \$username,

diff --git a/guc-clients/assignphone b/guc-clients/assignphone
index 91b10a9d32184f25b1736691e4664e0fd8be1235..4b06f66eb6f56678e798d87c598d1825c0961d65 100755 (executable)
--- a/guc-clients/assignphone
+++ b/guc-clients/assignphone
@@ -13,7 +13,7 @@ my $api_key;
 
 my $help;
 my $username;
-my $configfile;
+my $configfile = undef;
 my $dryrun = 0;
 my ($g_ua, $session, $api_key, $auth_key, $data, $domain);
 my ($user, $sipuser, $mac);
@@ -23,6 +23,14 @@ my $config = AppConfig->new({ CREATE => 1 });
 $config->define("api_url=s");
 $config->define("api_keyfile=s");
 
+foreach ( 
+       "/usr/local/etc/hermes/hermes_config",
+       "/usr/local/etc/hermes/config",
+       "/etc/hermes/config",
+       $ENV{"HOME"} . "/.hermes/config",
+       $ENV{"HOME"} . "/.hermes_config",
+) { $configfile = $_ if ( -f $_ ); }
+
 GetOptions(
        "help"          => \$help,
        "macaddress=s"  => \$mac,

diff --git a/guc-clients/feide2sipuser b/guc-clients/feide2sipuser
index 5660c5e1b18ff9fbf5644a96e1135c8e25edcf3e..fe20e47286f611024b1abded2cbab4647f8d81af 100755 (executable)
--- a/guc-clients/feide2sipuser
+++ b/guc-clients/feide2sipuser
@@ -13,7 +13,7 @@ my $api_key;
 
 my $help;
 my $username;
-my $configfile;
+my $configfile = undef;
 my $dryrun = 0;
 my ($g_ua, $session, $api_key, $auth_key, $data, $domain);
 my ($user, $displayname, $phone, $mail, $sipuser, $linetext);
@@ -31,6 +31,14 @@ $config->define("numbers_local_prefix=s");
 $config->define("numbers_local_series=s");
 $config->define("numbers_countrycode=s");
 
+foreach ( 
+       "/usr/local/etc/hermes/hermes_config",
+       "/usr/local/etc/hermes/config",
+       "/etc/hermes/config",
+       $ENV{"HOME"} . "/.hermes/config",
+       $ENV{"HOME"} . "/.hermes_config",
+) { $configfile = $_ if ( -f $_ ); }
+
 GetOptions(
        "help"          => \$help,
        "username=s"    => \$username,

diff --git a/guc-clients/listsipusers b/guc-clients/listsipusers
index 3648cd0fc6436319a8e2dcd79b4059c6d50d98c6..fccedb0e57a022170bed2d156a014f967f693073 100755 (executable)
--- a/guc-clients/listsipusers
+++ b/guc-clients/listsipusers
@@ -13,14 +13,11 @@ use JSON;
 use AppConfig;
 use Text::Iconv;
 
-use Data::Dumper;
-
-my $utf2iso = Text::Iconv->new("utf-8","latin1");
 my $api_key;
 
 my $help;
 my $username;
-my $configfile;
+my $configfile = undef;
 my $dryrun = 0;
 my ($g_ua, $session, $api_key, $auth_key, $data, $domain);
 my ($user, $displayname, $phone, $mail, $sipuser, $linetext);
@@ -30,8 +27,13 @@ my $config = AppConfig->new({ CREATE => 1 });
 $config->define("api_url=s");
 $config->define("api_keyfile=s");
 
-#TODO: Move this to config file.
-$config->default_domain("hig.no");
+foreach ( 
+       "/usr/local/etc/hermes/hermes_config",
+       "/usr/local/etc/hermes/config",
+       "/etc/hermes/config",
+       $ENV{"HOME"} . "/.hermes/config",
+       $ENV{"HOME"} . "/.hermes_config",
+) { $configfile = $_ if ( -f $_ ); }
 
 GetOptions(
        "help"          => \$help,