From e17dffd20dd5139b80799825591b56a68162520a Mon Sep 17 00:00:00 2001 From: Jan Huwald Date: Mon, 23 Apr 2012 16:10:42 +0000 Subject: p2ptbl: polish diff --git a/files/common/sbin/p2ptbl b/files/common/sbin/p2ptbl index 0a5bae3..3c18855 100755 --- a/files/common/sbin/p2ptbl +++ b/files/common/sbin/p2ptbl @@ -1,6 +1,4 @@ -#!/bin/sh - -set -e +#!/bin/sh -e init () { [ -n "$1" ] || printArgs @@ -48,6 +46,8 @@ update () { } merge () { + # we use sort instead of merge here to be robust in case the rows + # are not sorted sort "$1" "$2" \ | { oldkey="" -- cgit v0.10.1