|
 |
0c7409a |
diff -Naur qle-0.0.18/qle-0.0.18.pl qle-0.0.18-mod/qle-0.0.18.pl
|
|
|
0c7409a |
--- qle-0.0.18/qle-0.0.18.pl 2009-12-21 19:13:12.000000000 +0200
|
|
|
04d151f |
+++ qle-0.0.18-mod/qle-0.0.18.pl 2010-01-10 22:52:53.000000000 +0200
|
|
|
04d151f |
@@ -50,6 +50,7 @@
|
|
|
04d151f |
|
|
|
9726205 |
# Build name of config file from name of executable file:
|
|
|
9726205 |
my ($progName, $pathName, $suffix) = fileparse("$0", qr/\.[^.]*/);
|
|
|
9726205 |
+ my $pathName = "/etc/qle/";
|
|
|
04d151f |
my $configFile;
|
|
|
9726205 |
if (File::Spec->file_name_is_absolute($pathName)) {
|
|
|
9726205 |
$configFile = "$pathName" . "$progName" . ".conf";
|
|
|
04d151f |
@@ -883,8 +884,14 @@
|
|
|
04d151f |
$doScp = process_scp( \@scpArray, $config{masterScp} );
|
|
|
04d151f |
}
|
|
|
04d151f |
else {
|
|
|
04d151f |
- print "Can't read super check partial file $config{masterScp}\n",
|
|
|
04d151f |
- "No super check partial.\n";
|
|
|
04d151f |
+ stat ( "/usr/share/qle/$config{masterScp}" );
|
|
|
04d151f |
+ if ( -r _ ) {
|
|
|
04d151f |
+ $doScp = process_scp( \@scpArray, "/usr/share/qle/$config{masterScp}" );
|
|
|
04d151f |
+ }
|
|
|
04d151f |
+ else {
|
|
|
04d151f |
+ print "Can't read super check partial file $config{masterScp}\n",
|
|
|
04d151f |
+ "No super check partial.\n";
|
|
|
04d151f |
+ }
|
|
|
04d151f |
}
|
|
|
04d151f |
|
|
|
04d151f |
my $scpWindow;
|
|
|
04d151f |
@@ -928,7 +935,13 @@
|
|
|
04d151f |
\%ituzHash, $config{ctyDat} );
|
|
|
04d151f |
}
|
|
|
04d151f |
else {
|
|
|
04d151f |
- print "Can't read cty.dat file $config{ctyDat}\n";
|
|
|
04d151f |
+ stat ( "/usr/share/qle/$config{ctyDat}" );
|
|
|
04d151f |
+ if (-r _) {
|
|
|
04d151f |
+ process_cty_dat( \%ctyHash, \%contHash, \%cqzHash,
|
|
|
04d151f |
+ \%ituzHash, "/usr/share/qle/$config{ctyDat}" );
|
|
|
04d151f |
+ } else {
|
|
|
04d151f |
+ print "Can't read cty.dat file $config{ctyDat}\n";
|
|
|
04d151f |
+ }
|
|
|
04d151f |
}
|
|
|
04d151f |
|
|
|
04d151f |
# Set up frame, used for entering new QSOs:
|
|
|
04d151f |
@@ -6643,7 +6656,7 @@
|
|
|
04d151f |
use Tk::Bitmap;
|
|
|
04d151f |
|
|
|
04d151f |
# use Tk::Image;
|
|
|
04d151f |
- my $kiwi = "kiwi-blk-52x52.xbm";
|
|
|
04d151f |
+ my $kiwi = "/usr/share/qle/kiwi-blk-52x52.xbm";
|
|
|
04d151f |
my $image = $window->Bitmap( -file => $kiwi )
|
|
|
04d151f |
or warn "Image file $kiwi not found :-( \n";
|
|
|
04d151f |
|
|
|
04d151f |
@@ -7323,7 +7336,7 @@
|
|
|
04d151f |
# subroutine process_scp
|
|
|
04d151f |
#
|
|
|
04d151f |
# Purpose: Reads file $config{masterScp}, turning the info into an
|
|
|
04d151f |
-# array.
|
|
|
04d151f |
+# array
|
|
|
04d151f |
#
|
|
|
04d151f |
# Args:
|
|
|
04d151f |
# Reference to super check partial array
|