gitclone: stricter error handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe 2023-05-18 13:01:12 +01:00
parent e804849486
commit 3da8d20cd6
1 changed files with 5 additions and 5 deletions

View File

@ -25,7 +25,7 @@ main()
clone_project clone_project
# clean in case of failure # clean in case of failure
rm -rf ${tmp_dir} >/dev/null 2>&1 rm -rf ${tmp_dir} >/dev/null 2>&1 || exit 1
} }
read_config() read_config()
@ -69,15 +69,15 @@ clone_project()
# clean out old version just in case # clean out old version just in case
if [ -d "${location}" ]; then if [ -d "${location}" ]; then
rm -rf ${location} rm -rf ${location} || exit 1
fi fi
git clone ${url} ${tmp_dir} || git clone ${bkup_url} ${tmp_dir} \ git clone ${url} ${tmp_dir} || git clone ${bkup_url} ${tmp_dir} \
|| err "ERROR: could not download ${name}" || err "ERROR: could not download ${name}"
( (
cd ${tmp_dir} || err "Could not access tmp directory." cd ${tmp_dir} || exit 1
git reset --hard ${revision} git reset --hard ${revision} || err "Cannot reset revision"
) )
patch_project patch_project
@ -96,7 +96,7 @@ patch_project()
continue continue
fi fi
( (
cd ${tmp_dir} cd ${tmp_dir} || exit 1
git am ${patchfile} || err "Cannot patch project: $name" git am ${patchfile} || err "Cannot patch project: $name"
) )
done done