moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: quote $wrksrc

Browse source 
Allows spaces in the directory name
This commit is contained in:
beefcurtains 2015-07-29 08:17:37 +00:00
parent 9c34767b3e
commit 3c424a73f6
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/hooks/post-extract/00-patches.sh
View file

@ -10,14 +10,14 @@ _process_patch() {
elif [ -n "$patch_args" ]; then elif [ -n "$patch_args" ]; then
_args=$patch_args _args=$patch_args
fi fi
cp -f $i $wrksrc cp -f $i "$wrksrc"
# Try to guess if its a compressed patch. # Try to guess if its a compressed patch.
if [[ $f =~ .gz$ ]]; then if [[ $f =~ .gz$ ]]; then
gunzip $wrksrc/${_patch} gunzip "$wrksrc/${_patch}"
_patch=${_patch%%.gz} _patch=${_patch%%.gz}
elif [[ $f =~ .bz2$ ]]; then elif [[ $f =~ .bz2$ ]]; then
bunzip2 $wrksrc/${_patch} bunzip2 "$wrksrc/${_patch}"
_patch=${_patch%%.bz2} _patch=${_patch%%.bz2}
elif [[ $f =~ .diff ]]; then elif [[ $f =~ .diff ]]; then
: :
@ -28,7 +28,7 @@ _process_patch() {
continue continue
fi fi
cd $wrksrc cd "$wrksrc"
patch -sl ${_args} -i ${_patch} 2>/dev/null patch -sl ${_args} -i ${_patch} 2>/dev/null
msg_normal "$pkgver: patch applied: ${_patch}.\n" msg_normal "$pkgver: patch applied: ${_patch}.\n"
} }

2
common/xbps-src/libexec/xbps-src-dobuild.sh
View file

@ -32,7 +32,7 @@ if [ -f "$XBPS_BUILD_DONE" ]; then
exit 0 exit 0
fi fi
cd $wrksrc || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc]\n" cd "$wrksrc" || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc]\n"
if [ -n "$build_wrksrc" ]; then if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || \ cd $build_wrksrc || \
msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc]\n" msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc]\n"

2
common/xbps-src/libexec/xbps-src-doconfigure.sh
View file

@ -32,7 +32,7 @@ if [ -f "$XBPS_CONFIGURE_DONE" ]; then
exit 0 exit 0
fi fi
cd $wrksrc || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc].\n" cd "$wrksrc" || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc].\n"
if [ -n "$build_wrksrc" ]; then if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || \ cd $build_wrksrc || \
msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc].\n" msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc].\n"

4
common/xbps-src/libexec/xbps-src-doextract.sh
View file

@ -41,7 +41,7 @@ fi
# If template defines do_extract() use it rather than the hooks. # If template defines do_extract() use it rather than the hooks.
if declare -f do_extract >/dev/null; then if declare -f do_extract >/dev/null; then
[ ! -d "$wrksrc" ] && mkdir -p $wrksrc [ ! -d "$wrksrc" ] && mkdir -p $wrksrc
cd $wrksrc cd "$wrksrc"
run_func do_extract run_func do_extract
else else
if [ -n "$build_style" ]; then if [ -n "$build_style" ]; then
@ -60,7 +60,7 @@ else
fi fi
[ -d $wrksrc ] && cd $wrksrc [ -d "$wrksrc" ] && cd "$wrksrc"
# If template defines post_extract(), use it. # If template defines post_extract(), use it.
if declare -f post_extract >/dev/null; then if declare -f post_extract >/dev/null; then

6
common/xbps-src/libexec/xbps-src-doinstall.sh
View file

@ -28,7 +28,7 @@ XBPS_INSTALL_DONE="${XBPS_STATEDIR}/${sourcepkg}_${XBPS_CROSS_BUILD}_install_don
XBPS_PRE_INSTALL_DONE="${XBPS_STATEDIR}/${sourcepkg}_${XBPS_CROSS_BUILD}_pre_install_done" XBPS_PRE_INSTALL_DONE="${XBPS_STATEDIR}/${sourcepkg}_${XBPS_CROSS_BUILD}_pre_install_done"
XBPS_POST_INSTALL_DONE="${XBPS_STATEDIR}/${sourcepkg}_${XBPS_CROSS_BUILD}_post_install_done" XBPS_POST_INSTALL_DONE="${XBPS_STATEDIR}/${sourcepkg}_${XBPS_CROSS_BUILD}_post_install_done"
cd $wrksrc || msg_error "$pkgver: cannot access to wrksrc [$wrksrc]\n" cd "$wrksrc" || msg_error "$pkgver: cannot access to wrksrc [$wrksrc]\n"
if [ -n "$build_wrksrc" ]; then if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || msg_error "$pkgver: cannot access to build_wrksrc [$build_wrksrc]\n" cd $build_wrksrc || msg_error "$pkgver: cannot access to build_wrksrc [$build_wrksrc]\n"
fi fi
@ -48,7 +48,7 @@ if [ ! -f $XBPS_INSTALL_DONE ]; then
# Run do_install() # Run do_install()
if [ ! -f $XBPS_INSTALL_DONE ]; then if [ ! -f $XBPS_INSTALL_DONE ]; then
cd $wrksrc cd "$wrksrc"
[ -n "$build_wrksrc" ] && cd $build_wrksrc [ -n "$build_wrksrc" ] && cd $build_wrksrc
if declare -f do_install >/dev/null; then if declare -f do_install >/dev/null; then
run_func do_install run_func do_install
@ -64,7 +64,7 @@ if [ ! -f $XBPS_INSTALL_DONE ]; then
# Run post_install() # Run post_install()
if [ ! -f $XBPS_POST_INSTALL_DONE ]; then if [ ! -f $XBPS_POST_INSTALL_DONE ]; then
cd $wrksrc cd "$wrksrc"
[ -n "$build_wrksrc" ] && cd $build_wrksrc [ -n "$build_wrksrc" ] && cd $build_wrksrc
if declare -f post_install >/dev/null; then if declare -f post_install >/dev/null; then
run_func post_install run_func post_install