http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.24.tar.gz

[xscreensaver] / driver / xscreensaver-text

diff --git a/driver/xscreensaver-text b/driver/xscreensaver-text
index 52f9f577b16562a82321686b6ecee4197f3f11e2..4960295634d7f437e9b945783e77f15ab449e097 100755 (executable)
--- a/driver/xscreensaver-text
+++ b/driver/xscreensaver-text
@@ -24,7 +24,7 @@ use Text::Wrap qw(wrap);
 use bytes;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.5 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.7 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $verbose = 0;
 my $http_proxy = undef;
@@ -282,7 +282,8 @@ sub output() {
 
   } elsif ($text_mode eq 'program') {
 
-    $text_program = which ($text_program);
+    my ($prog, $args) = ($text_program =~ m/^([^\s]+)(.*)$/);
+    $text_program = which ($prog) . $args;
     print STDERR "$progname: running $text_program\n" if ($verbose);
 
     if ($wrap_columns && $wrap_columns > 0) {
@@ -307,7 +308,7 @@ sub output() {
     safe_system ("date", "+%c");
     print "\n";
     my $ut = `uptime`;
-    $ut =~ s/^[ \d:]*//;
+    $ut =~ s/^[ \d:]*(am|pm)?//i;
     $ut =~ s/,\s*(load)/\n$1/;
     print "$ut\n";
   }