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

xbps-src: improve vinstall(), add vmove() for subpkgs.

Browse source
This commit is contained in:
Juan RP 2011-07-02 11:33:59 +02:00
parent ff312cd1be
commit 6cb6110f4e
1 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

42
xbps-src/shutils/install_files.sh
View file

@ -32,12 +32,12 @@ vinstall()
local targetfile="$4" local targetfile="$4"
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
msg_red "vinstall: package DESTDIR unset, can't continue...\n" msg_red "vinstall: DESTDIR unset, can't continue...\n"
return 1 return 1
fi fi
if [ $# -lt 3 ]; then if [ $# -lt 3 ]; then
msg_red "vinstall: 3 arguments expected, only provided $#\n" msg_red "vinstall: 3 arguments expected: <file> <mode> <target-directory>\n"
return 1 return 1
fi fi
@ -47,9 +47,9 @@ vinstall()
fi fi
if [ -z "$targetfile" ]; then if [ -z "$targetfile" ]; then
install -Dm${mode} ${file} ${DESTDIR}/${targetdir}/${file} install -Dm${mode} ${file} "${DESTDIR}/${targetdir}/$(basename ${file})"
else else
install -Dm${mode} ${file} ${DESTDIR}/${targetdir}/${targetfile} install -Dm${mode} ${file} "${DESTDIR}/${targetdir}/$(basename ${targetfile})"
fi fi
} }
@ -58,6 +58,10 @@ vcopy()
local files=$1 local files=$1
local targetdir="$2" local targetdir="$2"
if [ -z "$DESTDIR" ]; then
msg_red "vcopy: DESTDIR unset, can't continue...\n"
return 1
fi
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
msg_red "vcopy: 2 arguments expected: <files> <target-directory>\n" msg_red "vcopy: 2 arguments expected: <files> <target-directory>\n"
return 1 return 1
@ -66,24 +70,46 @@ vcopy()
cp -a $files ${DESTDIR}/${targetdir} cp -a $files ${DESTDIR}/${targetdir}
} }
vmove()
{
local files=$1
local targetdir="$2"
if [ -z "$DESTDIR" ]; then
msg_red "vmove: DESTDIR unset, can't continue...\n"
return 1
elif [ -z "$SRCPKGDESTDIR" ]; then
msg_red "vmove: SRCPKGDESTDIR unset, can't continue...\n"
return 1
fi
if [ $# -ne 2 ]; then
msg_red "vmove: 2 arguments expected: <files> <target-directory>\n"
return 1
fi
if [ ! -d ${DESTDIR}/${targetdir} ]; then
vmkdir ${targetdir}
fi
mv ${SRCPKGDESTDIR}/$files ${DESTDIR}/${targetdir}
}
vmkdir() vmkdir()
{ {
local dir="$1" local dir="$1"
local mode="$2" local mode="$2"
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
msg_red "vmkdir: package DESTDIR unset, can't continue...\n" msg_red "vmkdir: DESTDIR unset, can't continue...\n"
return 1 return 1
fi fi
if [ $# -lt 1 ]; then if [ -z "$dir" ]; then
msg_red "vmkdir: 1 arguments expected: <directory> <mode>\n" msg_red "vmkdir: directory argument unset.\n"
return 1 return 1
fi fi
if [ -z "$mode" ]; then if [ -z "$mode" ]; then
install -d ${DESTDIR}/${dir} install -d ${DESTDIR}/${dir}
else else
install -d -m${mode} ${DESTDIR}/${dir} install -dm${mode} ${DESTDIR}/${dir}
fi fi
} }