fix console.pl for Windows better

so that it continues to work OK on Linux.

diff --git a/Changes b/Changes
index 9e75c1dcdea7453d39339d3b83b4788fe80cbee5..8562017b651e0cb12cac18e5b5151ee97dce530d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+08Apr10=======================================================================
+1. Modify console.pl so that it works in a Windows Cmd window. Get a Windows
+Curses ppd from: http://cpan.uwinnipeg.ca/dist/Curses.
 18Mar10=======================================================================
 1. Make privilege 0 "stick" if set on nodes
 13Mar10=======================================================================

diff --git a/perl/Version.pm b/perl/Version.pm
index 23e1786ebdd8efdaed09d273e789106d51d812d4..fc9c3a5acd3b64622a35ea36e0d27d125bfdb393 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '66';
+$build = '67';
 
 1;

diff --git a/perl/console.pl b/perl/console.pl
index d98b95f8f18b5ef93b84ca8ee740193586d15820..0a6d7404ba62c066539afd4697ba2d2fafba6771 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -23,6 +23,7 @@ BEGIN {
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
+       $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
 }
 
 use Msg;
@@ -54,7 +55,7 @@ $spos = $pos = $lth = 0;
 $inbuf = "";
 @time = ();
 
-$SIG{WINCH} = sub {@time = gettimeofday};
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -84,9 +85,9 @@ sub do_initscr
                init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
                init_pair(13, COLOR_YELLOW, COLOR_GREEN);
                init_pair(14, COLOR_RED, COLOR_GREEN);
-               eval { assume_default_colors($foreground, $background) };
+               eval { assume_default_colors($foreground, $background) } unless $is_win;
        }
-       
+
        $top = $scr->subwin($lines-4, $cols, 0, 0);
        $top->intrflush(0);
        $top->scrollok(1);