From: Paul <paul@claws-mail.org>
Date: Tue, 24 Sep 2019 09:34:51 +0000 (+0100)
Subject: some clean up in tools/
X-Git-Tag: 3.17.5~74
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=61889fd9465da61b0db28d75860a91745b7a51d5;hp=41f150e4d758fb24520f992d0107b5e5f310e3b0

some clean up in tools/

* remove out-dated OOo2claws-mail.pl
* replace google_search.pl with ddg_search.pl (DuckDuckGo instead of
  Google)
* update README
---

diff --git a/tools/OOo2claws-mail.pl b/tools/OOo2claws-mail.pl
deleted file mode 100755
index 84249cd0d..000000000
--- a/tools/OOo2claws-mail.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-
-#  * Copyright 2002 Paul Mangan <paul@claws-mail.org>
-#  *
-#  * This file is free software; you can redistribute it and/or modify it
-#  * under the terms of the GNU General Public License as published by
-#  * the Free Software Foundation; either version 3 of the License, or
-#  * (at your option) any later version.
-#  *
-#  * This program is distributed in the hope that it will be useful, but
-#  * WITHOUT ANY WARRANTY; without even the implied warranty of
-#  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  * General Public License for more details.
-#  *
-#  * You should have received a copy of the GNU General Public License
-#  * along with this program; if not, write to the Free Software
-#  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# OOo2claws-mail.pl	helper script to send documents from OpenOffice.org
-#			to Claws Mail
-
-use strict;
-
-my $input = <>;
-
-$ARGV =~ s/^"attachment='file:\/\///;
-$ARGV =~ s/'"$//;
-$ARGV =~ s/%20/ /g;
-exec "claws-mail --attach \"$ARGV\"";
-## change the line above to point to your claws-mail executable
-
-exit;
diff --git a/tools/README b/tools/README
index 2c7802c03..74d33a1bf 100644
--- a/tools/README
+++ b/tools/README
@@ -6,9 +6,8 @@ Contents of the tools directory:
 Action scripts:
   cm-reparent.pl                Fix thread parenting for two or more messages
   cm-break.pl                   Remove thread parenting for one or more messages
-  freshmeat_search.pl           Search freshmeat.net for selected text
+  ddg_search.pl                 Search DuckDuckGo for selected text
   google_msgid.pl               Search groups.google.com for selected message-id
-  google_search.pl              Search google.com for selected text
   multiwebsearch.pl             Search any search engine for the selected text
   textviewer.sh                 Attempt to view an attachment as plain text
   uudec                         Decode and display uuencoded images
@@ -71,17 +70,17 @@ Action scripts
   COMMAND: cm-break.pl %F
   Break thread references for the selected messages
 
+* ddg_search.pl
+  WORKS ON: selection
+  COMMAND: |ddg_search.pl
+  Search duckduckgo.com for selected text using the default Claws Mail browser
+
 * google_msgid.pl
   WORKS ON: selection
   COMMAND: |google_msgid.pl
   Lookup selected message-id in google using mozilla. Edit the script to use
   different browsers.
 
-* google_search.pl
-  WORKS ON: selection
-  COMMAND: |google_search.pl
-  Search google.com for selected text using the default Claws Mail browser
-
 * multiwebsearch.pl
   WORKS ON: selection
   see further down for details
diff --git a/tools/google_search.pl b/tools/ddg_search.pl
similarity index 69%
rename from tools/google_search.pl
rename to tools/ddg_search.pl
index fc0c92f16..b7d5f58fd 100755
--- a/tools/google_search.pl
+++ b/tools/ddg_search.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-#  * Copyright 2003-2007 Paul Mangan <paul@claws-mail.org>
+#  * Copyright 2003-2019 Paul Mangan <paul@claws-mail.org>
 #  *
 #  * This file is free software; you can redistribute it and/or modify it
 #  * under the terms of the GNU General Public License as published by
@@ -24,9 +24,10 @@
 
 use URI::Escape;
 use POSIX qw(locale_h);
+use locale;
 use Text::Iconv;
 
-my $google = "http://www.google.com/search?q";
+my $ddg = "https://duckduckgo.com/?q";
 $_ = <>;
 
 $locale = setlocale(LC_CTYPE);
@@ -35,17 +36,23 @@ $locale =~ s/\S+\.//;
 $converter = Text::Iconv->new("$locale", "UTF-8");
 $safe=uri_escape($converter->convert("$_"));
 
-chdir($ENV{HOME} . "/.claws-mail") || die("Can't find your .claws-mail directory\n");
+my $config_dir = `claws-mail --config-dir` or die("ERROR:
+	You don't appear to have Claws Mail installed\n");
+chomp $config_dir;
 
-open (SYLRC, "<clawsrc") || die("Can't open the clawsrc file\n");
-	@rclines = <SYLRC>;
-close SYLRC;
+chdir($ENV{HOME} . "/$config_dir") or die("ERROR:
+	Claws Mail config directory not found [~/$config_dir]
+	You need to run Claws Mail once, quit it, and then rerun this script\n");
+
+open (CMRC, "<clawsrc") || die("Can't open the clawsrc file\n");
+	@rclines = <CMRC>;
+close CMRC;
 
 foreach $rcline (@rclines) {
 	if ($rcline =~ m/^uri_open_command/) {
 		chomp $rcline;
 		@browser = split(/=/, $rcline);
-		$browser[1] =~ s/%s/$google=$safe/;
+		$browser[1] =~ s/%s/$ddg=$safe/;
 	}
 }
 system("$browser[1]&");