diff options
| author | Joey Hess <joey@kitenet.net> | 2013-05-08 22:36:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-08 22:36:37 -0400 |
| commit | 15d892407b0bdcd8fd5bad28eb3a541955bfe5bd (patch) | |
| tree | a7c9fd6c05c1e146a4b05caa7053ea7bc9bccc46 | |
| parent | 7b0e85dd0081f0aeb90e4f82d958765f3ca5f6ee (diff) | |
Fix type -p bashism that crept in via recent patches. Closes: #707319
| -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 8cd9402..8087a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (1.3) unstable; urgency=low + + * Fix type -p bashism that crept in via recent patches. Closes: #707319 + + -- Joey Hess <joeyh@debian.org> Wed, 08 May 2013 22:36:30 -0400 + etckeeper (1.2) unstable; urgency=low * Call type -p in a more compatable way. diff --git a/uninit.d/50vcs-uninit b/uninit.d/50vcs-uninit index 519a725..d717196 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 type -p tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif type -p mktemp >/dev/null 2>&1; then + elif which 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 1b738c8..18520dc 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 type -p tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif type -p mktemp >/dev/null 2>&1; then + elif which mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 |