diff options
| author | Joey Hess <joey@kitenet.net> | 2013-05-06 11:26:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-06 11:26:48 -0400 |
| commit | 114e3ed40a7ddb3a6a5613aef6b9309dcba1df8c (patch) | |
| tree | 14d262aa4b3ca9b718e5d69d9f5b6c5213c88480 | |
| parent | 0813f15a67733714c5c6a7650e97880837df773e (diff) | |
Call type -p in a more compatable way.
| -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 fa7ee2b..2f9e9e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (1.2) UNRELEASED; urgency=low + + * Call type -p in a more compatable way. + + -- Joey Hess <joeyh@debian.org> Mon, 06 May 2013 11:26:29 -0400 + etckeeper (1.1) unstable; urgency=low * Fix warning when PUSH_REMOTE is not set. Closes: #706917 diff --git a/uninit.d/50vcs-uninit b/uninit.d/50vcs-uninit index 803b0b5..519a725 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 [ -n "`type -p tempfile`" ]; then + if type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif 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 7ad3caa..1b738c8 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 [ -n "`type -p tempfile`" ]; then + if type -p tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif [ -n "`type -p mktemp`" ]; then + elif type -p mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 |