Merge tag 'v0.4.1' into debian

Author: dimitry-ishenko

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16) # focal
-project(devdocs VERSION 0.4 LANGUAGES C)
+project(devdocs VERSION 0.4.1 LANGUAGES C)
 
 option(SYSTEM_INSTALL "" OFF)
 

README.md

@@ -10,7 +10,7 @@ and _[w3m](https://w3m.sourceforge.net/)_ text-based browser?
 Stable version (requires [CMake](https://cmake.org/) >= 3.16):
 
 ```shell
-$ p=devdocs v=0.4
+$ p=devdocs v=0.4.1
 $ wget -O ${p}-${v}.tar.gz https://github.com/dimitry-ishenko-cpp/${p}/archive/refs/tags/v${v}.tar.gz
 $ tar xzf ${p}-${v}.tar.gz
 $ mkdir ${p}-${v}/build

bin/devgrep.in

@@ -5,7 +5,7 @@ from json import load
 from os import environ
 from pathlib import Path
 from subprocess import call, check_output
-from sys import argv
+from sys import argv, stderr
 
 devopen = argv[0].replace("grep", "open")
 fzf = [ "fzf" ]
@@ -16,7 +16,7 @@ www = environ.get("DEVDOCS_BROWSER", "w3m")
 root_path = Path("@DEVDOCS_INSTALL_DATADIR@")
 html_path = root_path / "html"
 
-local = sorted([ path.name for path in html_path.iterdir() ])
+local = sorted([ path.name for path in html_path.iterdir() if path.is_dir() ])
 
 def get_item(items, query):
     input = "\n".join(items)
@@ -99,8 +99,7 @@ class ArgumentParser(argparse.ArgumentParser):
         self.add_argument("pattern" , nargs="?")
 
     def error(self, message):
-        print("Error:", message)
-        usage()
+        print("Error:", message, file=stderr)
         exit(1)
 
 parser = ArgumentParser()

bin/devopen.in

@@ -5,7 +5,7 @@ from json import load
 from os import environ
 from pathlib import Path
 from subprocess import call, check_output
-from sys import argv
+from sys import argv, stderr
 
 fzf = [ "fzf", "--no-sort" ]
 pgm = Path(argv[0]).name
@@ -15,7 +15,7 @@ www = environ.get("DEVDOCS_BROWSER", "w3m")
 root_path = Path("@DEVDOCS_INSTALL_DATADIR@")
 html_path = root_path / "html"
 
-local = sorted([ path.name for path in html_path.iterdir() ])
+local = sorted([ path.name for path in html_path.iterdir() if path.is_dir() ])
 
 def get_item(items):
     input = "\n".join(items)
@@ -102,8 +102,7 @@ class ArgumentParser(argparse.ArgumentParser):
         self.add_argument("entry" , nargs="?")
 
     def error(self, message):
-        print("Error:", message)
-        usage()
+        print("Error:", message, file=stderr)
         exit(1)
 
 parser = ArgumentParser()