bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: safely change directories

Browse source 
In preparation for the removal of the global error trap we need a
way to ensure changing directories succeeds.  Add a "cd_safe"
wrapper that performs the necessary check.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2012-03-09 17:43:47 +10:00 • committed by Dan McGee
parent 1917c845f7
commit 923214497f
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scripts/makepkg.sh.in
View file

@ -874,6 +874,14 @@ error_function() {
exit 2 # $E_BUILD_FAILED exit 2 # $E_BUILD_FAILED
} }
cd_safe() {
if ! cd "$1"; then
error "$(gettext "Failed to change to directory %s")" "$1"
plain "$(gettext "Aborting...")"
exit 1
fi
}
run_function() { run_function() {
if [[ -z $1 ]]; then if [[ -z $1 ]]; then
return 1 return 1
@ -891,7 +899,7 @@ run_function() {
fi fi
msg "$(gettext "Starting %s()...")" "$pkgfunc" msg "$(gettext "Starting %s()...")" "$pkgfunc"
cd "$srcdir" cd_safe "$srcdir"
# ensure all necessary build variables are exported # ensure all necessary build variables are exported
export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST
@ -969,7 +977,7 @@ run_package() {
} }
tidy_install() { tidy_install() {
cd "$pkgdir" cd_safe "$pkgdir"
msg "$(gettext "Tidying install...")" msg "$(gettext "Tidying install...")"
if [[ $(check_option docs) = "n" && -n ${DOC_DIRS[*]} ]]; then if [[ $(check_option docs) = "n" && -n ${DOC_DIRS[*]} ]]; then
@ -1226,7 +1234,7 @@ write_pkginfo() {
} }
check_package() { check_package() {
cd "$pkgdir" cd_safe "$pkgdir"
# check existence of backup files # check existence of backup files
local file local file
@ -1255,7 +1263,7 @@ create_package() {
check_package check_package
cd "$pkgdir" cd_safe "$pkgdir"
msg "$(gettext "Creating package...")" msg "$(gettext "Creating package...")"
local nameofpkg local nameofpkg
@ -1414,7 +1422,7 @@ create_srcpackage() {
# tar it up # tar it up
msg2 "$(gettext "Compressing source package...")" msg2 "$(gettext "Compressing source package...")"
cd "${srclinks}" cd_safe "${srclinks}"
if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then
error "$(gettext "Failed to create source package file.")" error "$(gettext "Failed to create source package file.")"
exit 1 # TODO: error code exit 1 # TODO: error code
@ -1430,7 +1438,7 @@ create_srcpackage() {
warning "$(gettext "Failed to create symlink to source package file.")" warning "$(gettext "Failed to create symlink to source package file.")"
fi fi
cd "${startdir}" cd_safe "${startdir}"
rm -rf "${srclinks}" rm -rf "${srclinks}"
} }
@ -1855,7 +1863,7 @@ canonicalize_path() {
if [[ -d $path ]]; then if [[ -d $path ]]; then
( (
cd "$path" cd_safe "$path"
pwd -P pwd -P
) )
else else
@ -2179,7 +2187,7 @@ fi
if (( GENINTEG )); then if (( GENINTEG )); then
mkdir -p "$srcdir" mkdir -p "$srcdir"
chmod a-s "$srcdir" chmod a-s "$srcdir"
cd "$srcdir" cd_safe "$srcdir"
download_sources download_sources
generate_checksums generate_checksums
exit 0 # $E_OK exit 0 # $E_OK
@ -2329,14 +2337,14 @@ if (( SOURCEONLY )); then
# Get back to our src directory so we can begin with sources. # Get back to our src directory so we can begin with sources.
mkdir -p "$srcdir" mkdir -p "$srcdir"
chmod a-s "$srcdir" chmod a-s "$srcdir"
cd "$srcdir" cd_safe "$srcdir"
if ( (( ! SKIPCHECKSUMS )) || \ if ( (( ! SKIPCHECKSUMS )) || \
( (( ! SKIPPGPCHECK )) && source_has_signatures ) ) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ) || \
(( SOURCEONLY == 2 )); then (( SOURCEONLY == 2 )); then
download_sources download_sources
fi fi
check_source_integrity check_source_integrity
cd "$startdir" cd_safe "$startdir"
# if we are root or if fakeroot is not enabled, then we don't use it # if we are root or if fakeroot is not enabled, then we don't use it
if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then
@ -2392,7 +2400,7 @@ umask 0022
# get back to our src directory so we can begin with sources # get back to our src directory so we can begin with sources
mkdir -p "$srcdir" mkdir -p "$srcdir"
chmod a-s "$srcdir" chmod a-s "$srcdir"
cd "$srcdir" cd_safe "$srcdir"
if (( NOEXTRACT )); then if (( NOEXTRACT )); then
warning "$(gettext "Skipping source retrieval -- using existing %s tree")" "src/" warning "$(gettext "Skipping source retrieval -- using existing %s tree")" "src/"
@ -2428,7 +2436,7 @@ else
fi fi
mkdir -p "$pkgdir" mkdir -p "$pkgdir"
chmod a-s "$pkgdir" chmod a-s "$pkgdir"
cd "$startdir" cd_safe "$startdir"
# if we are root or if fakeroot is not enabled, then we don't use it # if we are root or if fakeroot is not enabled, then we don't use it
if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then
@ -2458,7 +2466,7 @@ else
devel_update devel_update
(( BUILDFUNC )) && run_build (( BUILDFUNC )) && run_build
(( CHECKFUNC )) && run_check (( CHECKFUNC )) && run_check
cd "$startdir" cd_safe "$startdir"
fi fi
enter_fakeroot enter_fakeroot