diff --git a/CHANGELOG b/CHANGELOG index 7c0761c..0fbdeb0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ # Offpunk History +## 1.5 - Unreleased +- Removed optional dependency to ripgrep. "grep --color=auto" is good enough. + ## 1.4 - April 25th 2022 - Making python-readability optional - Removing "next" and "previous" which are quite confusing and not obvious diff --git a/README.md b/README.md index bca522c..cf945e1 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,6 @@ Dependencies to enable web browsing (packagers should put those in an offpunk-we Nice to have (packagers should probaly make those optional): * [Xsel](http://www.vergenet.net/~conrad/software/xsel/) allows to `go` to the URL copied in the clipboard without having to paste it (both X and traditional clipboards are supported). Also needed to use the `copy` command. (apt-get install xsel) * [Python-setproctitle](https://github.com/dvarrazzo/py-setproctitle) will change the process name from "python" to "offpunk". Useful to kill it without killing every python service. -* [RipGrep](https://github.com/BurntSushi/ripgrep) is used, if found, to add colours to your in-page searches ("find" or "/"). ## Features diff --git a/debian/control b/debian/control index a07024d..d69bad3 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: python3-bs4, ${misc:Depends}, ${python3:Depends} -Suggests: xsel, python3-setproctitle, python3-readability, ripgrep, chafa (>= 1.10.0), python3-pil +Suggests: xsel, python3-setproctitle, python3-readability, chafa (>= 1.10.0), python3-pil Description: Offpunk is an offline-first browser for the smolnet A command-line and offline-first smolnet browser/feed reader for Gemini, Gopher, Spartan and Web. diff --git a/offpunk.py b/offpunk.py index 63d7327..26efe5b 100755 --- a/offpunk.py +++ b/offpunk.py @@ -211,9 +211,7 @@ _MAX_REDIRECTS = 5 _MAX_CACHE_SIZE = 10 _MAX_CACHE_AGE_SECS = 180 -_GREP = "grep" -if shutil.which("rg"): - _GREP = "rg" +_GREP = "grep --color=auto" less_version = 0 if not shutil.which("less"): print("Please install the pager \"less\" to run Offpunk.") @@ -3267,7 +3265,6 @@ Marks are temporary until shutdown (not saved to disk).""" output += " - python-pil : " + has(_HAS_PIL) output += "\nNice to have:\n" output += " - python-setproctitle : " + has(_HAS_SETPROCTITLE) - output += " - ripgrep : " + has(shutil.which("rg")) output += " - xsel : " + has(_HAS_XSEL) output += "\nFeatures :\n" diff --git a/ubuntu_dependencies.txt b/ubuntu_dependencies.txt index bb9a7ad..afdb976 100644 --- a/ubuntu_dependencies.txt +++ b/ubuntu_dependencies.txt @@ -1 +1 @@ -sudo apt install less file xdg-utils xsel ripgrep chafa timg python3-cryptography python3-requests python3-feedparser python3-bs4 python3-readability python3-pil python3-setproctitle +sudo apt install less file xdg-utils xsel chafa timg python3-cryptography python3-requests python3-feedparser python3-bs4 python3-readability python3-pil python3-setproctitle