about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_units6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 99e07370d..79fa9c085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-19  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 46044 (tweaked per Matthew): Completion/Unix/Command/_units:
+	Correct the path to the units data file on Debian with units
+	2.00 and newer and on FreeBSD.
+
 2020-06-18  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 46067: Test/A05execution.ztst: Add a unit test for
diff --git a/Completion/Unix/Command/_units b/Completion/Unix/Command/_units
index bea77ae67..6d86f4dc3 100644
--- a/Completion/Unix/Command/_units
+++ b/Completion/Unix/Command/_units
@@ -40,10 +40,12 @@ local -a testfiles
 testfiles=(
   /usr/share/units.dat		# GNU on Fedora
   /usr/share/units/units.dat    # on gentoo
-  /usr/share/misc/units.dat     # on Debian
+  /usr/share/units/definitions.units # on Debian, units 2.00 and newer
   /usr/local/share/units.dat    # GNU DIY install
   /usr/share/lib/unittab	# Solaris
-  /usr/share/misc/units.lib     # BSD
+  /usr/share/misc/units.lib     # OpenBSD [as of 2020]; also FreeBSD 9.1
+  /usr/share/misc/definitions.units     # FreeBSD 12.1
+  /usr/share/misc/units.dat     # on Debian, units 1.88 and older
 )
 
 datfile=${opt_args[-f]:-${opt_args[--file]}}