diff options
author | Joey Hess <joey@kitenet.net> | 2013-05-15 14:20:17 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-05-15 14:20:17 -0400 |
commit | 819d09a251de910dfa1afc421d5d8d57c3f5fcb0 (patch) | |
tree | a1df55af4d80f320616df84e091475051b86667a | |
parent | ef5dbb625a7d2a00bf2242dcffe109e9d8665785 (diff) |
Deal with unix^wlinux portability nonsense.
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | uninit.d/50vcs-uninit | 4 | ||||
-rwxr-xr-x | update-ignore.d/01update-ignore | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8087a4d..66ff92d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (1.4) UNRELEASED; urgency=low + + * Deal with unix^wlinux portability nonsense. + + -- Joey Hess <joeyh@debian.org> Wed, 15 May 2013 14:19:50 -0400 + etckeeper (1.3) unstable; urgency=low * Fix type -p bashism that crept in via recent patches. Closes: #707319 diff --git a/uninit.d/50vcs-uninit b/uninit.d/50vcs-uninit index d717196..93f5df7 100755 --- a/uninit.d/50vcs-uninit +++ b/uninit.d/50vcs-uninit @@ -21,9 +21,9 @@ if ! grep -q "$managed_by_etckeeper" "$file"; then exit 0 else realfile="$file" - if which tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1;; then tempfile="tempfile" - elif which mktemp >/dev/null 2>&1; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore index 18520dc..7b2de72 100755 --- a/update-ignore.d/01update-ignore +++ b/update-ignore.d/01update-ignore @@ -171,9 +171,9 @@ if [ -e "$file" ]; then fi fi realfile="$file" - if which tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif which mktemp >/dev/null 2>&1; then + elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 |