patches/rss-glx-102-install-util.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16113 de237866e868
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.

diff -Nurp -x '*~' -x '*.orig' rss-glx_0.9.0/utils/rss-glx_install.pl rss-glx_0.9.0/utils/rss-glx_install.pl
--- rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-27 17:41:41.038691000 -0700
+++ rss-glx_0.9.0/utils/rss-glx_install.pl	2009-05-27 17:41:46.423704000 -0700
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 use strict;
 
-if (`ps x | grep ' xscreensaver ' | grep -v grep`) {
-	print "XScreenSaver seems to be running. Exit it before running this script.\n";
-	exit;
-}
+#if (`ps x | grep ' xscreensaver ' | grep -v grep`) {
+#	print "XScreenSaver seems to be running. Exit it before running this script.\n";
+#	exit;
+#}
 
 my $screensavers = { };
 
@@ -31,15 +31,15 @@ $screensavers->{'lorenz'}	= '  GL:      
 $screensavers->{'drempels'}	= '  GL:               "Drempels"  drempels --root                             \\n\\';
 $screensavers->{'feedback'}	= '  GL:               "Feedback"  feedback --root                             \\n\\';
 
-open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver";
+open XSCREENSAVER, "$ARGV[0]";
 my @xscreensaver_config_file = <XSCREENSAVER>;
 close XSCREENSAVER;
 
-open XSCREENSAVER, ">$ENV{'HOME'}/.xscreensaver";
+open XSCREENSAVER, ">$ARGV[0]";
 
 my $programs_section_flag = 0;
 foreach my $line (@xscreensaver_config_file) {
-	if ($line =~ /^programs:/) {
+	if ($line =~ /^\*programs:/) {
 		$programs_section_flag = 1;
 	} elsif ($programs_section_flag) {
 		if ($line =~ /\\\s+/) {