From 4bfd722d376edf19ce083b5bed2d4df7ff1c7862 Mon Sep 17 00:00:00 2001 From: ru Date: Thu, 3 Feb 2005 00:18:06 +0000 Subject: [PATCH] Fix bugs. Due to one of the bugs (^C was the first character of each line when sorting), the -b option of sort(1) didn't take any effect, so stay bug-compatible, and remove the -b option. --- games/fortune/tools/do_sort | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/games/fortune/tools/do_sort b/games/fortune/tools/do_sort index b868a4c22b32..07e301b2cf71 100644 --- a/games/fortune/tools/do_sort +++ b/games/fortune/tools/do_sort @@ -1,11 +1,13 @@ #! /bin/sh # # @(#)do_sort 8.1 (Berkeley) 5/31/93 +# $FreeBSD$ # # an aggressive little script for sorting the fortune files # depends on octal 02 and 03 not being anywhere in the files. -sp="/usr/bin/sort -bdfu -T /var/tmp" +sp="/usr/bin/sort -dfu -T /var/tmp" -sed 's/^%$//' | tr '\12' '\3' | tr '\2' '\12' | $sp | sed 'a\ - %' | sed -e 's/^//' -e 's/$//' | tr '\3' '\12' +sed 's/^%$//' | tr '\12' '\3' | tr '\2' '\12' | + sed -e 's/^//' -e '/^$/d' -e 's/$/%/' | + $sp | tr '\3' '\12'