void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix info dir file handling correctly this time. Reset xstow_args into

Browse source 
the default value once the package has been stowned successfully.

--HG--
extra : convert_revision : 74158cdc505ccc38d01120810e593215ed14ddaa
This commit is contained in:
Juan RP 2008-09-30 18:19:52 +02:00
parent 24e08d308b
commit ec4eec30f4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgfs.sh
View file

@ -554,6 +554,8 @@ stow_tmpl()
local pkg="$1" local pkg="$1"
local infodir_pkg="share/info/dir" local infodir_pkg="share/info/dir"
local infodir_master="$PKGFS_MASTERDIR/share/info/dir" local infodir_master="$PKGFS_MASTERDIR/share/info/dir"
local my_xstowargs=
local real_xstowargs="$xstow_args"
[ -z "$pkg" ] && return 2 [ -z "$pkg" ] && return 2
@ -565,8 +567,8 @@ stow_tmpl()
xstow_args="$xstow_args -i-file-in-dir $infodir_pkg" xstow_args="$xstow_args -i-file-in-dir $infodir_pkg"
fi fi
$PKGFS_XSTOW_CMD -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ $PKGFS_XSTOW_CMD ${xstow_args} -pd-targets $PKGFS_MASTERDIR \
${xstow_args} -pd-targets $PKGFS_MASTERDIR \ -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \
$PKGFS_DESTDIR/$pkg $PKGFS_DESTDIR/$pkg
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo "*** ERROR: couldn't create symlinks for \`$pkg' ***" echo "*** ERROR: couldn't create symlinks for \`$pkg' ***"
@ -575,6 +577,8 @@ stow_tmpl()
echo ">>> Created \`$pkg' symlinks into master directory." echo ">>> Created \`$pkg' symlinks into master directory."
fi fi
xstow_args="$real_xstowargs"
installed_tmpl_handler register $pkg installed_tmpl_handler register $pkg
} }