From: Dirk Koopman Date: Sat, 16 Jun 2007 16:33:16 +0000 (+0100) Subject: try to fix the gtkconsole CVS version no X-Git-Tag: 1.55~161 X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ac264a972df84ae5c0eb38ba76c68d148f36349;hp=9835865a2132510fb2cc996ba5da1c3aad5ed986;p=spider.git try to fix the gtkconsole CVS version no add missing gcomiit scripts --- diff --git a/gcommit b/gcommit new file mode 120000 index 00000000..0f051e46 --- /dev/null +++ b/gcommit @@ -0,0 +1 @@ +perl/gcommit \ No newline at end of file diff --git a/gtkconsole/gtkconsole b/gtkconsole/gtkconsole index ad2d05a3..2af1c4e9 100755 --- a/gtkconsole/gtkconsole +++ b/gtkconsole/gtkconsole @@ -4,7 +4,7 @@ # # usage: gtkconsole [] [ ] # -# Copyright (c) 2001-6 Dirk Koopman G1TLH +# Copyright (c) 2006-2007 Dirk Koopman G1TLH # # $Id$ # @@ -49,6 +49,8 @@ our ($dx, $cmd, $ann, $wcy, $wwv); # scrolling list windows our $bot; # the cmd entry window our $date; # the current date +require "$root/local/DXVars.pm" if -e "$root/local/DXVars.pm"; + # read in the user data our $userfn = "$ENV{HOME}/.gtkconsole_data"; our $user = read_user_data(); @@ -80,7 +82,7 @@ unless ($call && $host) { my $node = $user->{clusters}->{$user->{node}}; if ($node->{call} || $user->{call}) { - $call = $node->{call} || $user->{call}; + $call = $node->{call} || $user->{call} || $main::myalias; $host = $node->{passwd}; $host = $node->{host}; $port = $node->{port}; @@ -88,15 +90,13 @@ unless ($call && $host) { } unless ($call && $host) { - if (-e "$root/local/DXVars.pm") { - require "$root/local/DXVars.pm"; - $call = $main::myalias; - $call = $main::myalias; # for the warning - } if (-e "$root/local/Listeners.pm") { require "$root/local/Listeners.pm"; $host = $main::listen->[0]->[0]; $port = $main::listen->[0]->[1]; + $host ||= '127.0.0.1'; + $host = "127.0.0.1" if $host eq '0.0.0.0'; + $port ||= 7300; } } @@ -365,11 +365,13 @@ sub read_user_data $u = { clusters => { + 'LOCAL' => {host => '127.0.0.1', port => 7300}, 'GB7DJK' => {host => 'gb7djk.dxcluster.net', port => 7300}, 'WR3D' => {host => 'wr3d.dxcluster.net', port => 7300}, 'GB7BAA' => {host => 'gb7baa.dxcluster.net', port => 7300}, }, - node => 'GB7DJK', + node => 'LOCAL', + call => $main::myalias, }; write_user_data($u); } diff --git a/perl/Version.pm b/perl/Version.pm index 53cb4727..dac731e1 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -10,6 +10,6 @@ package main; use vars qw($version $build); $version = '1.53'; -$build = '15'; +$build = '16'; 1; diff --git a/perl/gcommit b/perl/gcommit new file mode 100755 index 00000000..efdff89c --- /dev/null +++ b/perl/gcommit @@ -0,0 +1,4 @@ +#!/bin/sh +# do a startard git commit +/spider/perl/issue.pl +git commit -a $@