sci-geosciences/tah/files/local_conf-2.patch

   1 Index: tilesGen.pl
   2 ===================================================================
   3 --- tilesGen.pl (revision 7387)
   4 +++ tilesGen.pl (working copy)
   5 @@ -33,7 +33,7 @@
   6  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   7  #-----------------------------------------------------------------------------
   8  # Read the config file
   9 -my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
  10 +my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
  11  my %EnvironmentInfo = CheckConfig(\%Config);
  12
  13  my $Layers = $Config{"Layers"};
  14 Index: upload.pl
  15 ===================================================================
  16 --- upload.pl   (revision 7387)
  17 +++ upload.pl   (working copy)
  18 @@ -35,7 +35,7 @@
  19  }
  20
  21  # conf file, will contain username/password and environment info
  22 -my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
  23 +my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
  24
  25  if ($Config{"LocalSlippymap"})
  26  {
  27 Index: compress.pl
  28 ===================================================================
  29 --- compress.pl (revision 7387)
  30 +++ compress.pl (working copy)
  31 @@ -28,7 +28,7 @@
  32  #-----------------------------------------------------------------------------
  33
  34  # conf file, will contain username/password and environment info
  35 -my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
  36 +my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
  37
  38  if ($Config{"LocalSlippymap"})
  39  {
  40 Index: tahlib.pm
  41 ===================================================================
  42 --- tahlib.pm   (revision 7387)
  43 +++ tahlib.pm   (working copy)
  44 @@ -3,7 +3,7 @@
  45  # =====================================================================
  46  # The following is duplicated from tilesGen.pl
  47  # =====================================================================
  48 -my %Config = ReadConfig("tilesAtHome.conf", "general.conf", "authentication.conf", "layers.conf");
  49 +my %Config = ReadConfig("$ENV{'HOME'}/.tah/tilesAtHome.conf", "general.conf", "$ENV{'HOME'}/.tah/authentication.conf", "layers.conf");
  50  my $lastmsglen = 0;
  51
  52  my $idleFor = 0;