From: Federico Kircheis <federico.kircheis@gmail.com>
To: cygwin-apps@cygwin.com
Cc: Federico Kircheis <federico.kircheis@gmail.com>
Subject: [PATCH 2/2] Exit in case `cd` fails
Date: Sun, 14 Jul 2019 19:39:00 -0000 [thread overview]
Message-ID: <20190714193933.30549-2-federico.kircheis@gmail.com> (raw)
In-Reply-To: <20190714193933.30549-1-federico.kircheis@gmail.com>
---
lib/src_fetch.cygpart | 2 +-
lib/src_prep.cygpart | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/src_fetch.cygpart b/lib/src_fetch.cygpart
index ed61d25..4f3f17e 100644
--- a/lib/src_fetch.cygpart
+++ b/lib/src_fetch.cygpart
@@ -156,7 +156,7 @@ __src_fetch() {
done
# the RCS_fetch functions change PWD
- cd "${top}";
+ cd "${top}" || error "Unable to cd to ${top}"
for uri in ${SRC_URI} ${PATCH_URI}
do
diff --git a/lib/src_prep.cygpart b/lib/src_prep.cygpart
index fb94c56..593dfb6 100644
--- a/lib/src_prep.cygpart
+++ b/lib/src_prep.cygpart
@@ -188,7 +188,7 @@ __gpg_verify() {
}
__mkdirs() {
- cd "${top}";
+ cd "${top}" || error "Unable to cd to ${top}";
mkdir -p "${srcdir}" "${origsrcdir}" "${B}" "${D}" "${T}" "${configdir}" "${logdir}" "${distdir}" "${patchdir}" "${spkgdir}";
}
@@ -267,7 +267,7 @@ __src_prep() {
local tar_patch;
local n=1;
- cd "${top}";
+ cd "${top}" || error "Unable to cd to ${top}";
__mkdirs;
@@ -326,7 +326,7 @@ __src_prep() {
__gpg_verify "${top}/${src_patchfile}" "SOURCE PATCH";
fi
- cd "${origsrcdir}";
+ cd "${origsrcdir}" || error "Unable to cd to ${origsrcdir}";
for src_pkg in ${_src_orig_pkgs}
do
@@ -358,7 +358,7 @@ __src_prep() {
# cd will fail if not executable (e.g. dot2tex)
chmod +x "${origsrcdir}/${SRC_DIR}";
- cd "${origsrcdir}/${SRC_DIR}";
+ cd "${origsrcdir}/${SRC_DIR}" || error "Unable to cd to ${origsrcdir}/${SRC_DIR}";
#****v* Preparation/DISTCLEANFILES
# DESCRIPTION
@@ -379,7 +379,7 @@ __src_prep() {
if __check_function src_unpack_hook
then
__check_unstable src_unpack_hook;
- cd "${origsrcdir}/${SRC_DIR}";
+ cd "${origsrcdir}/${SRC_DIR}" | error "Unable to cd to ${origsrcdir}/${SRC_DIR}";
fi
for src_patch in ${_src_orig_patches}
@@ -415,7 +415,7 @@ __src_prep() {
if __check_function src_patch_hook
then
__check_unstable src_patch_hook;
- cd "${origsrcdir}/${SRC_DIR}";
+ cd "${origsrcdir}/${SRC_DIR}" || error "Unable to cd to ${origsrcdir}/${SRC_DIR}";
fi
__step "Preparing working source directory";
@@ -425,7 +425,7 @@ __src_prep() {
mkdir -p "${C}";
ln -sfn "${C}" "${workdir}/CYGWIN-PATCHES";
- cd "${S}";
+ cd "${S}" || error "Unable to cd to ${S}";
if [ -f "${top}/${cygwin_patchfile}" ]
then
--
2.20.1
next prev parent reply other threads:[~2019-07-14 19:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-14 13:25 cygport development Federico Kircheis
2019-07-14 17:11 ` Brian Inglis
2019-07-14 19:39 ` [PATCH 1/2] Add support for path with spaces Federico Kircheis
2019-07-14 19:39 ` Federico Kircheis [this message]
2019-09-28 11:56 ` cygport development Federico Kircheis
2019-10-13 16:41 ` Achim Gratz
2019-10-14 8:55 ` Federico Kircheis
2019-10-14 17:15 ` Doug Henderson
2020-05-12 14:59 ` Federico Kircheis
2020-05-15 4:55 ` Yaakov Selkowitz
2020-05-17 17:54 ` Federico Kircheis
2020-05-29 4:38 ` Federico Kircheis
2020-06-12 7:55 ` Federico Kircheis
2020-06-29 16:04 ` Federico Kircheis
2021-11-06 14:53 ` Federico Kircheis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190714193933.30549-2-federico.kircheis@gmail.com \
--to=federico.kircheis@gmail.com \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).