From d4f5f0cec768df07f813aee1e5df2c687a0ad186 Mon Sep 17 00:00:00 2001
From: Martin Afanasjew <martin@afanasjew.de>
Date: Tue, 28 Jun 2016 21:35:49 +0200
Subject: [PATCH] brew.sh: rename 'chdir' to 'safe_cd'
This is inspired by `safe_system` with basically the same implication
(fail on error), making the name a lot less confusing and avoiding a
clash with the `chdir` function previously defined in `bin/brew`.
Closes #414.
Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
---
Library/Homebrew/cmd/update.sh | 4 ++--
Library/brew.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 4298daab67..aafae72407 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -311,7 +311,7 @@ EOS
# only allow one instance of brew update
lock update
- chdir "$HOMEBREW_REPOSITORY"
+ safe_cd "$HOMEBREW_REPOSITORY"
git_init_if_necessary
# rename Taps directories
# this procedure will be removed in the future if it seems unnecessary
@@ -382,7 +382,7 @@ EOS
pull "$DIR"
done
- chdir "$HOMEBREW_REPOSITORY"
+ safe_cd "$HOMEBREW_REPOSITORY"
if [[ -n "$HOMEBREW_UPDATED" ||
-n "$HOMEBREW_UPDATE_FAILED" ||
diff --git a/Library/brew.sh b/Library/brew.sh
index 8d55601c0f..b3315a301b 100644
--- a/Library/brew.sh
+++ b/Library/brew.sh
@@ -20,7 +20,7 @@ odie() {
exit 1
}
-chdir() {
+safe_cd() {
cd "$@" >/dev/null || odie "Error: failed to cd to $*!"
}
--
GitLab