mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
scripts: unset CDPATH if cd is used
This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
b4f5a63e7f
commit
13a1d5883c
@ -36,6 +36,8 @@ export TEXTDOMAINDIR='@localedir@'
|
|||||||
|
|
||||||
# file -i does not work on Mac OSX unless legacy mode is set
|
# file -i does not work on Mac OSX unless legacy mode is set
|
||||||
export COMMAND_MODE='legacy'
|
export COMMAND_MODE='legacy'
|
||||||
|
# Ensure CDPATH doesn't screw with our cd calls
|
||||||
|
unset CDPATH
|
||||||
|
|
||||||
myver='@PACKAGE_VERSION@'
|
myver='@PACKAGE_VERSION@'
|
||||||
confdir='@sysconfdir@'
|
confdir='@sysconfdir@'
|
||||||
|
@ -122,8 +122,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old"
|
|||||||
|
|
||||||
# step 2: tar it up
|
# step 2: tar it up
|
||||||
msg "$(gettext "Tar'ing up %s...")" "$dbroot"
|
msg "$(gettext "Tar'ing up %s...")" "$dbroot"
|
||||||
cd "$dbroot"
|
bsdtar -czf "$workdir/pacman-db.tar.gz" -C "$dbroot" ./
|
||||||
bsdtar -czf "$workdir/pacman-db.tar.gz" ./
|
|
||||||
if (( $? )); then
|
if (( $? )); then
|
||||||
rm -rf "$workdir"
|
rm -rf "$workdir"
|
||||||
die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot"
|
die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot"
|
||||||
|
Loading…
Reference in New Issue
Block a user