From 6e6cd1a2c60c6d6e29deb214188e62d0b82955af Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 25 Apr 2006 20:13:37 +0000 Subject: [PATCH] * lib/install-sh: Simplify the expr implementation of dirname. --- ChangeLog | 4 ++++ lib/install-sh | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35bbdcc..af226cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-04-25 Stepan Kasal + + * lib/install-sh: Simplify the expr implementation of dirname. + 2006-04-24 Paul Eggert * lib/install.sh: Handle --, and diagnose unknown options. diff --git a/lib/install-sh b/lib/install-sh index 11850a9..220d664 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-04-24.12 +scriptversion=2006-04-25.22 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -238,8 +238,7 @@ do expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$dst" : 'X\(//\)[^/]' \| \ X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$dst" : 'X\(/\)' \| . 2>/dev/null || echo X"$dst" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ -- 2.7.4