summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Batischev <eual.jp@gmail.com>2017-09-16 23:36:41 +0300
committerAlexander Batischev <eual.jp@gmail.com>2017-09-17 17:38:11 +0300
commitf13f4b014b7478dd2742940144ab44aac507af52 (patch)
treeb52051008bf0831a877e2c55ae0c7d32d753c0e6
parent437c4284d12ec5aa7ca9ae9b4c3f618ebd33dd4d (diff)
(News|Pod)beuter → (News|Pod)boat
-rw-r--r--CHANGELOG.md459
-rw-r--r--LICENSE1
-rw-r--r--Makefile20
-rw-r--r--README.md46
-rw-r--r--config.h8
-rwxr-xr-xcontrib/getpocket.com/create-pocket-user-token.sh4
-rw-r--r--doc/chapter-cmdline.txt22
-rw-r--r--doc/chapter-firststeps.txt38
-rw-r--r--doc/chapter-password.txt14
-rw-r--r--doc/chapter-podcasts.txt16
-rw-r--r--doc/chapter-snownews.txt6
-rw-r--r--doc/chapter-tagging.txt10
-rw-r--r--doc/configcommands.dsv46
-rw-r--r--doc/example-config56
-rw-r--r--doc/faq.txt8
-rwxr-xr-xdoc/gen-example-config.pl6
-rw-r--r--doc/keycmds.dsv2
-rw-r--r--doc/manpage-newsboat.txt (renamed from doc/manpage-newsbeuter.txt)43
-rw-r--r--doc/manpage-podbeuter.txt89
-rw-r--r--doc/manpage-podboat.txt87
-rw-r--r--doc/newsboat.txt (renamed from doc/newsbeuter.txt)344
-rw-r--r--doc/podbeuter-cmds.dsv2
-rw-r--r--filter/FilterParser.cpp16
-rw-r--r--include/keymap.h2
-rw-r--r--po/ca.po12
-rw-r--r--po/de.po12
-rw-r--r--po/es.po12
-rw-r--r--po/es_ES.po10
-rw-r--r--po/fr.po12
-rw-r--r--po/hu.po12
-rw-r--r--po/it.po12
-rw-r--r--po/ja.po12
-rw-r--r--po/nb.po12
-rw-r--r--po/newsbeuter.pot6
-rw-r--r--po/nl.po12
-rw-r--r--po/pl.po12
-rw-r--r--po/pt_BR.po12
-rw-r--r--po/ru.po10
-rw-r--r--po/sv.po12
-rw-r--r--po/tr.po10
-rw-r--r--po/uk.po12
-rw-r--r--po/zh.po10
-rw-r--r--po/zh_TW.po12
-rw-r--r--src/colormanager.cpp2
-rw-r--r--src/configcontainer.cpp2
-rw-r--r--src/controller.cpp5
-rw-r--r--src/download.cpp2
-rw-r--r--src/pb_controller.cpp8
-rw-r--r--src/view.cpp2
-rw-r--r--test/cache.cpp4
-rwxr-xr-xtest/generate_coverage_report.sh2
-rw-r--r--test/test-helpers.h2
52 files changed, 556 insertions, 1032 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5883ff8..192d12c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
-# Changes for Newsbeuter
+# Changes for Newsboat
## 2.10 - Unreleased
+This is what Newsbeuter 2.10 should have been. Newsboat continues Newsbeuter's
+version numbering to show that we are a spiritual continuation, not a separate
+project.
+
### Added
- Solarized-light colorscheme (OmeGa)
- Japanese and Catalan translations (The Flying Rapist; Alejandro Gallo)
@@ -126,456 +130,3 @@
Kerdoncuff)
- Don't ignore config's last line if there's no \n at the end (#426) (Spiridonov
Alexander)
-
-
-
-## 2.9 - 2015-02-19
-
-### Added
-- Support for FeedHQ
-
-### Changed
-- Update to Brazilian Portuguese translation (#126)
-- Code base now uses C++11
-- Don't override feed titles for hidden feeds
-- Don't render inline images (#154)
-
-### Fixed
-- Custom keybindings in tag and filter selection dialogs (#78)
-- Incorrect reloading of tags after editing the urls file
-- Dumpconfig
-- Missing variable in log output (#124)
-- Type of configuration variables to path where appropriate (#125)
-- Crash when GUID is lost (#127)
-- Dependency check (#132)
-- Segfault in `jump_to_next_unread_item` (#133)
-- Feeds appearing empty due to variable shadowing issue
-- Catch an exception that might be thrown by the "killfile" function
-
-
-
-## 2.8 - 2014-01-19
-
-### Added
-- Bookmark script for getpocket.com support (Andreas Happe)
-- Support for The Old Reader
-- Support for NewsBlur (Thomas Weißschuh)
-
-### Changed
-- In the feed list, quitting now is the same as clearing the tag in case a tag
- is selected
-- Make guid generation smarter (Jochen Sprickerhof)
-- Update French translation (Sabrina Dubroca)
-
-### Fixed
-- Issues with the build process on OpenBSD (Kyle Isom)
-- Crash bug in filter expression parsing
-- Crash bug with unbalanced `<ol>` tags (Richard Quirk)
-
-
-
-## 2.7 - 2013-08-27
-
-### Added
-- Option to colorize unread messages (Patrick Steinhardt)
-- Option to swap title and hints bar (Patrick Steinhardt)
-- `%u` and `%t` support to itemview (Giuliano Schneider)
-
-### Changed
-- Only force redraw if a form action is active (Patrick Steinhardt)
-
-### Fixed
-- Crash bug
-
-
-
-## 2.6 - 2013-03-19
-
-### Added
-- Support for `<q>` and `<aside>` tags (Daniel Aleksandersen)
-- Norwegian bokmål translation (Daniel Aleksandersen)
-
-### Changed
-- Style table headers in bold (Daniel Aleksandersen)
-- Updated Russian translation (Justin Forest)
-- Updated Polish translation (Michal Siemek)
-- More compact default user-agent on Mac OS X (Daniel Aleksandersen)
-- Remove all soft-hyphens (Daniel Aleksandersen)
-
-### Fixed
-- Crash in RSS parser (thanks to Isaac Good)
-- Authentication issues with Google Reader (thanks to Fabrice Noilhan)
-- Bug in Google authentication (Daniel Aleksandersen).
-
-
-
-## 2.5 (2012-01-06):
-
-### Added
-- `download-full-page` configuration option
-- Configuration option to use external URL viewer (#242)
-- Ability to store Google Reader password in an external file (#239)
-- Tiny Tiny RSS support (#243)
-- `delete-read-articles-on-quit` option
-
-### Changed
-- HTTP authentication method is now configurable (#247)
-
-### Fixed
-- Rendering of nested `<ol>` lists
-
-
-
-## 2.4 - 2011-02-01
-
-### Added
-- Support for query feeds in combination with Google Reader support
-- Ability to configure proxy authentication method
-- `-q` flag to enable quiet startup (Isaac Good)
-- Keys to jump to the next/previous feed or article regardless of its "unread"
- status (Jim Pryor)
-- XDG Base Directory support (Elrond)
-- `cookie-cache` configuration option (#234)
-- On-demand loading of feeds to reduce memory usage
-- Feedlist re-sorting after all feeds have been reloaded
-- Support for Google Reader offline mode
-
-### Removed
-- Bloglines support, as the service shuts down on October 1, 2010
-
-### Fixed
-- Google Reader authentication issue with certain passwords (#238)
-
-
-
-## 2.3 - 2010-06-24
-
-### Changed
-- Made newsbeuter silent on lockfile errors when '-x' option is used
-
-### Fixed
-- HTML rendering of bold and underline text when light background is configured
-- issues #192, #194, #197, #198, #199, #200, #201, #202, #210, #216
-- Google Reader authentication (by Seth Mason)
-
-
-
-## 2.2 - 2010-03-14
-
-### Added
-- Google Reader support
-- Article highlighting in article list based on the article content (#174)
-- "Hard quit" key to immediately quit from Newsbeuter (Jim Pryor)
-- "Download status" format specifier for feedlist-format (#181).
-- HTML table renderer (Stefan Erben)
-- `open-in-browser-and-mark-read` key (Isaac Good)
-
-### Changed
-- "Ignore article" functionality extended with different ignore modes
- (download/display; #52)
-
-### Fixed
-- Issues #90, #160, #161, #168, #169, #171, #179, #180, #184
-- Issues #183, #188 (Stefan Erben)
-
-
-
-## 2.1 - 2009-12-08
-
-### Added
-- Support for `dc:creator` tag for RSS 2.0 parser
-- When entering a feed, the first unread article is automatically selected (can
- be turned off with `goto-first-unread no`)
-- When marking a feed read, move the selection to the next feed (unless a filter
- is currently applied)
-- Length field to article list format (Stefan Erben)
-- Support for 256-color terminals
-- `dumpform` commandline command as a debugging aid
-- Allow deletion of articles from article view
-- Support for SOCKS proxies
-- `notify-beep` notification beep (Vern Sun)
-- Key to quickly jump to article URLs above #10 (Stefan Erben)
-
-### Changed
-- Improved HTML rendering (Stefan Erben)
-
-### Fixed
-- Podbeuter ignored `use-proxy` configuration command (#144)
-
-
-
-## 2.0 - 2009-04-21
-
-### Added
-- More flexible dialog handling
-- Ability to specify a list of OPML URLs when using OPML as URL source
-- `keep-articles-days` config option to optionally keep articles only for
- a limited number of days
-- `bookmark-interactive` config option to indicate that the configured
- bookmarking command is interactive
-- Ability to search for text from the article view
-- Basic support for Yahoo Media RSS
-- `:source` commandline command to (re)load configuration files
-- `age` attribute for articles to filter them for relative age (in days)
-- Ability to configure local files as feeds
-- `random-unread` key to go to a random unread article
-- Ability to sort feed list and article list by interactively choosing the sort
- method
-- `pipe-to` key to pipe articles to external commands
-- Backtick evaluation for configuration files
-- Commandline completion
-- `between` operator for filter language
-- `set` commandline command can now toggle boolean variables and reset
- configuration variables of all types to their default
-- Commandline and search history persistence
-
-### Changed
-- Improved position handling in article list (#112) (Isaac Good)
-- Replaced mrss with new RSS/Atom parser
-- Made article view pager configurable
-- Improved HTML rendering of links and underlined and bold text
-- When opening articles from a search result dialog, make search phrase stand
- out in article view.
-- Improved help dialog so that it now shows unbound functions
-- Improved and extended conditional HTTP download handling
-
-### Fixed
-- A lot of bugs (#102, #111, #117, #130, #131)
-- Don't display authentication information in URLs (#121)
-
-
-
-## 1.3 - 2008-12-06
-
-### Added
-- Placeholders for `download-path` (#46)
-- Ability to edit the list of subscribed URLs from newsbeuter through a text
- editor
-- A file format to exchange information about read articles between different
- newsbeuter instances
-- `feed-sort-order` configuration option to sort the feed list by the first tag
-- Ability to toggle read flag from article view (Isaac Good)
-- Ability to configure the number of parallel reload threads (#101)
-
-### Changed
-- Some internal data structures now use smart pointers (stability improvement)
-- Extended podbeuter to keep finished downloads in the queue until they've been
- played
-- Extended keymap to allow dialog-specific configuration
-- Extended macros to enable modification of configuration variables
-
-
-
-## 1.2 - 2008-09-02
-
-### Added
-- `download-timeout` and `download-retries` config options to make newsbeuter
- more reliable over unreliable connection (#88)
-
-### Changed
-- Improved whitespace handling in XML parser (fixes Debian issue #496765)
-
-### Fixed
-- Crash in case of invalid color/attribute names in the configuration
-- Broken `open-in-browser` operation for URLs that contained a single quote
- (fixes Debian issue #497495; fixes incomplete security fix)
-
-
-
-## 1.1 - 2008-09-01
-
-### Added
-- Line wrap for the article view's headers and the link list on the bottom
- (fixes Debian issue #491122)
-- Test suite for functional tests of the user interface
-
-### Security
-- Fixed potential security issue when opening article URLs with the configured
- browser (thanks to J.H.M. Dassen (Ray) for pointing out)
-
-
-
-## 1.0 - 2008-08-20
-
-### Added
-- Support for highlighting of regular expressions
-- Search function in help dialog
-- `show-read-articles` configuration option to toggle displaying of read
- articles
-- `always-download` configuration option to configure a list of feed URLs for
- which newsbeuter ignores the Last-Modified timestamp
-- Reading progress display in article view
-- Optional format string support for `browser` configuration option
-- `reset-unread-on-update` configuration command
-
-
-
-## 0.9.1 - 2008-05-12
-
-### Added
-- Ability to open feed's link by pressing the `open-in-browser` key in feed list.
-
-### Fixed
-- Issue with filter feeds
-- Issue with RFC-822 date parsing where the year only had 2 digits
-
-
-
-## 0.9 - 2008-05-01
-
-### Added
-- Commandline option to podbeuter to automatically start download
-- `article-sort-order` configuration option to freely configure the sort order
- of article lists
-- Ability to delete articles
-
-### Changed
-- Improved locking to allow multiple newsbeuter instances (one instance per
- cache file)
-- Flagged articles don't get deleted anymore
-
-### Fixed
-- Lots of bug fixes
-
-
-
-## 0.8.2 - 2008-03-16
-
-### Fixed
-- Broken string conversion
-
-
-
-## 0.8.1 - 2008-03-12
-
-### Fixed
-- Crash (related to string conversion of format string support)
-
-
-
-## 0.8 - 2008-03-07
-
-### Added
-- Custom configurability of feed list and article list format
-- Special tags to rename feeds
-- Macro support
-- Ruby scripting support
-
-### Changed
-- Improved reload speed by checking the Last-Modified header
-- Directly integrated nxml/mrss code since API and ABI are a moving target
-
-
-
-## 0.7 - 2007-09-18
-
-### Added
-- Possibility to predefine filters
-- Bloglines synchronization support
-- OPML online subscription support
-- Plugin-based bookmarking support
-- Custom flagging of articles
-- Implemented more key commands to ease navigation even more
-- Possibility to optionally use an external HTML renderer
-
-### Changed
-- Redesigned search function
-
-
-
-## 0.6 - 2007-08-14
-
-### Added
-- Support for reloading the urls file
-- Query feeds
-- History for the most important input fields
-- Additional commandline commands
-
-### Fixed
-- Major bug with filtering in the item list
-- OPML import functionality
-
-
-
-## 0.5 - 2007-08-02
-
-### Added
-- Unicode compatibility
-- Support for notifications
-- Filter language
-- It is now possible to freely configure e.g. the up/down-keys
-
-### Changed
-- Improved HTML rendering
-- Improved lock file handling
-
-
-
-## 0.4 - 2007-05-08
-
-### Added
-- Configuration option to disable cache cleanup (user request)
-- Configuration option to set the HTTP user-agent header to a custom value
-- Italian translation (Andrea Marchesini)
-- Unit tests
-- `include` configuration command to make it possible to separate the
- configuration into several files
-- Global configuration file /etc/newsbeuter/config
-- Support for Snownews/Liferea extension scripts
-
-### Changed
-- Refactored view
-- Significant speed improvement for reload and cache cleanup (Jürgen Jung)
-
-
-
-## 0.3 - 2007-03-26
-
-### Added
-- gettext support
-- Podcast support
-
-### Changed
-- Now, everything is stored as UTF-8 internally, and gets converted on-the-fly
-
-### Removed
-- Dependency to `libidn`
-
-### Fixed
-- Numerous bugs
-
-
-
-## 0.2 - 2007-02-21
-
-### Added
-- Possibility to use the space key for key bindings
-- Possibility to view all URLs within an article and open them in a browser
-- HTTP proxy support
-- Color configuration support
-- Tagging/categorization support
-- Auto-reload support
-- Search dialog
-
-### Changed
-- `next unread` function now works across feeds when in item view
-- Improved HTML rendering (occasional missing spaces, `<pre>` tags)
-
-### Removed
-- Unnecessary mutex lock/unlock that made newsbeuter lock up when the
- `max-items` config option was set
-
-
-
-## 0.1.1 - 2007-01-17
-
-### Fixed
-- Crash when ISO-8859-1 encoded feeds with umlauts in the title were displayed
- on systems with UTF-8 locales enabled
-
-
-
-## 0.1 - 2007-01-16
-
-### Added
-- This is an initial release of Newsbeuter
diff --git a/LICENSE b/LICENSE
index 539fbd8d..7ec2adf7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,6 +3,7 @@ MIT/X Consortium License
Copyright 2006-2015 Andreas Krennmair <ak@newsbeuter.org>
Copyright 2015-2017 Alexander Batischev <eual.jp@gmail.com>
Copyright 2006-2017 Newsbeuter contributors
+Copyright 2017 Newsboat contributors
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/Makefile b/Makefile
index 44d8c7d6..c3ece43d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES)
CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES)
LDFLAGS+=-L. -fprofile-arcs -ftest-coverage
-PACKAGE=newsbeuter
+PACKAGE=newsboat
ifeq (, $(filter $(MAKECMDGOALS),distclean run-i18nspector))
include config.mk
@@ -42,7 +42,7 @@ FILTERLIB_SOURCES=filter/Scanner.cpp filter/Parser.cpp filter/FilterParser.cpp
FILTERLIB_OBJS:=$(patsubst %.cpp,%.o,$(FILTERLIB_SOURCES))
FILTERLIB_OUTPUT=libfilter.a
-NEWSBEUTER=newsbeuter
+NEWSBEUTER=newsboat
NEWSBEUTER_SOURCES:=$(shell cat mk/newsbeuter.deps)
NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES))
NEWSBEUTER_LIBS=-lbeuter -lfilter -lpthread -lrsspp
@@ -52,7 +52,7 @@ RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
RSSPPLIB_OUTPUT=librsspp.a
-PODBEUTER=podbeuter
+PODBEUTER=podboat
PODBEUTER_SOURCES:=$(shell cat mk/podbeuter.deps)
PODBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(PODBEUTER_SOURCES))
PODBEUTER_LIBS=-lbeuter -lpthread
@@ -139,11 +139,11 @@ clean: clean-newsbeuter clean-podbeuter clean-libbeuter clean-libfilter clean-do
distclean: clean clean-mo test-clean profclean
$(RM) core *.core core.* config.mk
-doc: doc/xhtml/newsbeuter.html doc/xhtml/faq.html doc/newsbeuter.1 doc/podbeuter.1
+doc: doc/xhtml/newsboat.html doc/xhtml/faq.html doc/newsboat.1 doc/podboat.1
-doc/xhtml/newsbeuter.html: doc/newsbeuter.txt
+doc/xhtml/newsboat.html: doc/newsboat.txt
$(MKDIR) doc/xhtml
- $(A2X) -f xhtml -D doc/xhtml doc/newsbeuter.txt
+ $(A2X) -f xhtml -D doc/xhtml doc/newsboat.txt
$(CHMOD) u+w doc/xhtml/docbook-xsl.css
doc/xhtml/faq.html: doc/faq.txt
@@ -157,14 +157,14 @@ doc/newsbeuter-cfgcmds.txt: doc/generate.pl doc/configcommands.dsv
doc/newsbeuter-keycmds.txt: doc/generate2.pl doc/keycmds.dsv
doc/generate2.pl doc/keycmds.dsv > doc/newsbeuter-keycmds.txt
-doc/newsbeuter.1: doc/manpage-newsbeuter.txt doc/newsbeuter-cfgcmds.txt doc/newsbeuter-keycmds.txt
- $(A2X) -f manpage doc/manpage-newsbeuter.txt
+doc/newsboat.1: doc/manpage-newsboat.txt doc/newsbeuter-cfgcmds.txt doc/newsbeuter-keycmds.txt
+ $(A2X) -f manpage doc/manpage-newsboat.txt
doc/podbeuter-cfgcmds.txt: doc/generate.pl doc/podbeuter-cmds.dsv
doc/generate.pl doc/podbeuter-cmds.dsv > doc/podbeuter-cfgcmds.txt
-doc/podbeuter.1: doc/manpage-podbeuter.txt doc/podbeuter-cfgcmds.txt
- $(A2X) -f manpage doc/manpage-podbeuter.txt
+doc/podboat.1: doc/manpage-podboat.txt doc/podbeuter-cfgcmds.txt
+ $(A2X) -f manpage doc/manpage-podboat.txt
fmt:
astyle --suffix=none --style=java --indent=tab --indent-classes *.cpp include/*.h src/*.cpp rss/*.{cpp,h} test/*.cpp
diff --git a/README.md b/README.md
index 34000706..09ad7a35 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,24 @@
-Newsbeuter [![Build Status](https://travis-ci.org/akrennmair/newsbeuter.svg?branch=master)](https://travis-ci.org/akrennmair/newsbeuter) [![Coverage Status](https://coveralls.io/repos/github/akrennmair/newsbeuter/badge.svg?branch=master)](https://coveralls.io/github/akrennmair/newsbeuter?branch=master)
-=====================
-by Andreas Krennmair <ak@newsbeuter.org>
+Newsboat
+========
-<a href="http://newsbeuter.org">
-<img
- src="https://newsbeuter.files.wordpress.com/2008/04/newsbeuter_640x640.png"
- align="left" height="80" width="80" vspace="6" /></a>
-
-Newsbeuter is an RSS feed reader for the text console. Zed Shaw
-[called](http://zedshaw.com/archive/i-want-the-mutt-of-feed-readers/) it "The
-Mutt of Feed Readers".
-
-It is designed to run on Unix-like operating systems such as GNU/Linux and
-FreeBSD. NetBSD is currently not supported, due to technical limitations.
+Newsboat is an actively maintained fork of Newsbeuter, an RSS/Atom feed reader
+for the text console.
Downloading
-----------
-You can download the latest version of newsbeuter from the following website:
-http://www.newsbeuter.org/
+You can download the latest version of Newsboat from the official site:
+https://newsboat.org/
-Alternatively, you can check out the latest version from the newsbeuter
-Git repository (hosted on GitHub):
+Alternatively, you can check out the latest version from the Git repository:
- git clone git://github.com/akrennmair/newsbeuter.git
+ git clone git://github.com/newsboat/newsboat.git
Dependencies
------------
-Newsbeuter depends on a number of libraries, which need to be installed before
-newsbeuter can be compiled.
+Newsboat depends on a number of libraries, which need to be installed before
+newsboat can be compiled.
- GCC 4.9 or newer, or Clang 3.6 or newer
- [STFL (version 0.21 or newer)](http://www.clifford.at/stfl/)
@@ -45,7 +34,8 @@ Debian unstable comes with ready-to-use packages for these dependencies.
Installation
------------
-Compiling and installing newsbeuter is as simple as:
+
+Compiling and installing newsboat is as simple as:
make
make install
@@ -63,21 +53,17 @@ If you're a developer, here's how you can run the test suite:
Note the use of ramdisk as `TMPDIR`: some of our tests require temporary files,
which degrades the performance quite a bit if `TMPDIR` isn't in-memory.
-Contact
--------
-Andreas Krennmair <ak@newsbeuter.org>
-
Support
-------
* Bugs and whatnot should be reported to the
- [issue tracker](https://github.com/akrennmair/newsbeuter/issues)
+ [issue tracker](https://github.com/newsboat/newsboat/issues)
* Drop us a line at
- [Newsbeuter mailing list](http://groups.google.com/group/newsbeuter)
-* Chat with developers and fellow users on #newsbeuter at
+ [newsboat mailing list](http://groups.google.com/group/newsboat)
+* Chat with developers and fellow users on #newsboat at
[Freenode](https://freenode.net)
License
-------
-Newsbeuter is licensed under the MIT/X Consortium License. See the file LICENSE
+Newsboat is licensed under the MIT/X Consortium License. See the file LICENSE
for further details.
diff --git a/config.h b/config.h
index 6fc47789..97606440 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
#ifndef NEWSBEUTER_CONFIG__H
#define NEWSBEUTER_CONFIG__H
-#define PACKAGE "newsbeuter"
+#define PACKAGE "newsboat"
#define PROGRAM_NAME PACKAGE
#define REAL_VERSION "2.10"
@@ -11,11 +11,11 @@
#define PROGRAM_VERSION REAL_VERSION
#endif
-#define PROGRAM_URL "http://www.newsbeuter.org/"
+#define PROGRAM_URL "https://newsboat.org/"
#define NEWSBEUTER_PATH_SEP "/"
-#define NEWSBEUTER_CONFIG_SUBDIR ".newsbeuter"
-#define NEWSBEUTER_SUBDIR_XDG "newsbeuter"
+#define NEWSBEUTER_CONFIG_SUBDIR ".newsboat"
+#define NEWSBEUTER_SUBDIR_XDG "newsboat"
#include <libintl.h>
#include <locale.h>
diff --git a/contrib/getpocket.com/create-pocket-user-token.sh b/contrib/getpocket.com/create-pocket-user-token.sh
index ddb2112e..c5c7666e 100755
--- a/contrib/getpocket.com/create-pocket-user-token.sh
+++ b/contrib/getpocket.com/create-pocket-user-token.sh
@@ -7,13 +7,13 @@
APPLICATION_CONSUMER_KEY="19002-18d9a9028a5ae783a9caabcd"
-output=`wget --post-data '{ "consumer_key":"19002-18d9a9028a5ae783a9caabcd", "redirect_uri":"https://github.com/akrennmair/newsbeuter/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"}' --header="Content-Type: application/json; charset=UTF-8" --header "X-Accept: application/json" "https://getpocket.com/v3/oauth/request" -O - 2>/dev/null`
+output=`wget --post-data '{ "consumer_key":"19002-18d9a9028a5ae783a9caabcd", "redirect_uri":"https://github.com/newsboat/newsboat/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"}' --header="Content-Type: application/json; charset=UTF-8" --header "X-Accept: application/json" "https://getpocket.com/v3/oauth/request" -O - 2>/dev/null`
# shamelessy copy this from contrib/bookmark-pinboard
TMP_TOKEN=`echo $output | sed 's/^.*\"code\":"\([^"]*\)".*$/\1/'`
# redirect user to pocket authentication page
-AUTH_URL="https://getpocket.com/auth/authorize?request_token=$TMP_TOKEN&redirect_uri=https://github.com/akrennmair/newsbeuter/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"
+AUTH_URL="https://getpocket.com/auth/authorize?request_token=$TMP_TOKEN&redirect_uri=https://github.com/newsboat/newsboat/blob/c8c92a17fa0862fb7a648e88723eb48cb9cb582c/contrib/getpocket.com/after_authentication.md"
echo $TMP_TOKEN> /tmp/pocket_token
echo "please navigate to