From 0b057b4ff43cfc560f67fe8312830289534de7d5 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 7 Mar 2018 02:22:58 +0100 Subject: run syncdocs.sh and syncscripts.sh Sync startup howto to fd1ed2227d529a7ee00d6206caa871ee40c08b69 Sync scriptassist to (2003020806) 211cd515ec87cf9a5d893e97894c2e4b58952f19 --- docs/startup-HOWTO.html | 6 +++--- docs/startup-HOWTO.txt | 15 ++++++++------- scripts/scriptassist.pl | 13 +++++++++---- utils/syncdocs.sh | 2 +- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html index aaf9e5fe..8cd7a010 100644 --- a/docs/startup-HOWTO.html +++ b/docs/startup-HOWTO.html @@ -411,7 +411,7 @@ Ctrl-X - set the next server in list active

Irssi supports connecting to IRC servers via a proxy. All server connections are then made through it, and if you’ve set up everything properly, you don’t need to do any /QUOTE SERVER commands manually.

-

Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:

+

Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening in irc.bouncer.org port 5000. You want to use it to connect to servers irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:

/SET use_proxy ON
 /SET proxy_address irc.bouncer.org
@@ -434,7 +434,7 @@ Ctrl-X                - set the next server in list active
 
 
Proxy specific settings:

 
-
All proxies have these settings in common:

+
All proxies except irssi proxy and socks proxy have these settings in common:

 
 
/SET use_proxy ON
 /SET proxy_address <Proxy host address>
@@ -488,7 +488,7 @@ Ctrl-X                - set the next server in list active
 
 
Irssi contains it’s own proxy which you can build giving \--with-proxy option to configure. You’ll still need to run irssi in a screen to use it though.

 
-
Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when you connect to it, but irssi proxy shares your existing IRC connection(s) to multiple clients. And even more clearly: You can use only one IRC server connection to IRC with as many clients as you want. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)

+
Irssi proxy is a bit different than most proxies, normally proxies create a new connection to IRC server when a new client connects to it, but irssi proxy shares your existing IRC connection(s) to multiple clients. And even more clearly: You can use only one IRC server connection of the irssi proxy to IRC with as many clients as you want. Can anyone figure out even more easier ways to say this, so I wouldn’t need to try to explain this thing for minutes every time? :)

 
 
Irssi proxy supports sharing multiple server connections in different ports, like you can share network in port 2777 and efnet in port 2778.

 
diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 23d7cf94..88912ef3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -460,7 +460,7 @@ need to do any /QUOTE SERVER commands manually.
 
 Here’s an example: You have your bouncer (lets say, BNC or BNC-like) listening
 in irc.bouncer.org port 5000. You want to use it to connect to servers
-irc.dalnet and irc.efnet.org. First you’d need to setup the bouncer:
+irc.dal.net and irc.efnet.org. First you’d need to setup the bouncer:
 
 /SET use_proxy ON
 /SET proxy_address irc.bouncer.org
@@ -485,7 +485,7 @@ which you can give to /SERVER and /SERVER ADD commands.
 
 Proxy specific settings:
 
-All proxies have these settings in common:
+All proxies except irssi proxy and socks proxy have these settings in common:
 
 /SET use_proxy ON
 /SET proxy_address 
@@ -543,11 +543,12 @@ Irssi contains it’s own proxy which you can build giving \--with-proxy option
 to configure. You’ll still need to run irssi in a screen to use it though.
 
 Irssi proxy is a bit different than most proxies, normally proxies create a new
-connection to IRC server when you connect to it, but irssi proxy shares your
-existing IRC connection(s) to multiple clients. And even more clearly: You can
-use only one IRC server connection to IRC with as many clients as you want. Can
-anyone figure out even more easier ways to say this, so I wouldn’t need to try
-to explain this thing for minutes every time? :)
+connection to IRC server when a new client connects to it, but irssi proxy
+shares your existing IRC connection(s) to multiple clients. And even more
+clearly: You can use only one IRC server connection of the irssi proxy to IRC
+with as many clients as you want. Can anyone figure out even more easier ways
+to say this, so I wouldn’t need to try to explain this thing for minutes every
+time? :)
 
 Irssi proxy supports sharing multiple server connections in different ports,
 like you can share network in port 2777 and efnet in port 2778.
diff --git a/scripts/scriptassist.pl b/scripts/scriptassist.pl
index 459d97f6..68708945 100644
--- a/scripts/scriptassist.pl
+++ b/scripts/scriptassist.pl
@@ -5,7 +5,7 @@
 
 use strict;
 
-our $VERSION = '2003020804';
+our $VERSION = '2003020806';
 our %IRSSI = (
     authors     => 'Stefan \'tommie\' Tomanek',
     contact     => 'stefan@pico.ruhr.de',
@@ -315,6 +315,7 @@ sub get_new {
     my $xml = get_scripts();
     foreach (sort {$xml->{$b}{last_modified} cmp $xml->{$a}{last_modified}} keys %$xml) {
 	my %entry = %{ $xml->{$_} };
+	next if $entry{HIDDEN};
 	$result->{$_} = \%entry;
 	$num--;
 	last unless $num;
@@ -390,6 +391,7 @@ sub search_scripts {
     my %result;
     foreach (sort keys %{$database}) {
 	my %entry = %{$database->{$_}};
+	next if $entry{HIDDEN};
 	my $string = $_." ";
 	$string .= $entry{description} if defined $entry{description};
 	if ($string =~ /$query/i) {
@@ -1051,7 +1053,7 @@ sub toggle_autorun {
     my $dir = Irssi::get_irssi_dir()."/scripts/";
     mkdir $dir."autorun/" unless (-e $dir."autorun/");
     return unless (-e $dir.$plname);
-    if (check_autorun($sname)) {
+    if (-e $dir."/autorun/".$plname) {
 	if (readlink($dir."/autorun/".$plname) eq "../".$plname) {
 	    if (unlink($dir."/autorun/".$plname)) {
 		print CLIENTCRAP "%R>>%n Autorun of ".$sname." disabled";
@@ -1062,8 +1064,11 @@ sub toggle_autorun {
 	    print CLIENTCRAP "%R>>%n ".$dir."/autorun/".$plname." is not a correct link";
 	}
     } else {
-	symlink("../".$plname, $dir."/autorun/".$plname);
-    	print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+	if (symlink("../".$plname, $dir."/autorun/".$plname)) {
+    	    print CLIENTCRAP "%R>>%n Autorun of ".$sname." enabled";
+	} else {
+	    print CLIENTCRAP "%R>>%n Unable to create autorun link";
+	}
     }
 }
 
diff --git a/utils/syncdocs.sh b/utils/syncdocs.sh
index e723edd2..ed76bf85 100755
--- a/utils/syncdocs.sh
+++ b/utils/syncdocs.sh
@@ -11,7 +11,7 @@ howto=$site/documentation/startup/
 # remove everything until H1 and optionally 2 DIVs before the
 # FOOTER. May need to be adjusted as the source pages change
 pageclean_regex='s{.*(?=\s*)?(
\s*)?)?\s*(
\s*){0,3})}{\1\2}g;'
 
 srcdir=`dirname "$0"`
-- 
cgit v1.2.3