zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH] _units: Correct the path to the units data file on Debian with units 2.00 and newer.
@ 2020-06-06  6:06 Daniel Shahaf
  2020-06-12  9:04 ` Daniel Shahaf
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Shahaf @ 2020-06-06  6:06 UTC (permalink / raw)
  To: zsh-workers

---
units.dat was renamed definitions.units in 2013 or earlier.  I've fixed
the path for Debian, but don't know whether any of the other paths
should be fixed too.

Cheers,

Daniel


 Completion/Unix/Command/_units | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_units b/Completion/Unix/Command/_units
index bea77ae67..6682c6d79 100644
--- a/Completion/Unix/Command/_units
+++ b/Completion/Unix/Command/_units
@@ -40,10 +40,11 @@ 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/misc/units.dat     # on Debian, units 1.88 and older
   /usr/local/share/units.dat    # GNU DIY install
   /usr/share/lib/unittab	# Solaris
   /usr/share/misc/units.lib     # BSD
+  /usr/share/units/definitions.units # on Debian, units 2.00 and newer
 )
 
 datfile=${opt_args[-f]:-${opt_args[--file]}}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] _units: Correct the path to the units data file on Debian with units 2.00 and newer.
  2020-06-06  6:06 [PATCH] _units: Correct the path to the units data file on Debian with units 2.00 and newer Daniel Shahaf
@ 2020-06-12  9:04 ` Daniel Shahaf
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Shahaf @ 2020-06-12  9:04 UTC (permalink / raw)
  To: zsh-workers

Daniel Shahaf wrote on Sat, 06 Jun 2020 06:06 +0000:
> ---
> units.dat was renamed definitions.units in 2013 or earlier.  I've fixed
> the path for Debian, but don't know whether any of the other paths
> should be fixed too.

I've had a chance to verify the FreeBSD path has changed too.  While
there, I've rearranged the patch so the new paths come first.

diff --git a/Completion/Unix/Command/_units b/Completion/Unix/Command/_units
index bea77ae67..78abf4191 100644
--- a/Completion/Unix/Command/_units
+++ b/Completion/Unix/Command/_units
@@ -40,10 +40,13 @@ 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/definitions.units     # BSD (e.g., FreeBSD 12.1)
+
+  /usr/share/misc/units.dat     # on Debian, units 1.88 and older
+  /usr/share/misc/units.lib     # BSD (e.g., FreeBSD 9.1)
 )
 
 datfile=${opt_args[-f]:-${opt_args[--file]}}

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-06-12  9:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-06  6:06 [PATCH] _units: Correct the path to the units data file on Debian with units 2.00 and newer Daniel Shahaf
2020-06-12  9:04 ` Daniel Shahaf

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).