faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made PKGDIR a command line parameter

Browse Source 
The package directory is now a command line param.
Also beefed up checking for package file existence.

Signed-off-by: Simo Leone <simo@archlinux.org>
This commit is contained in:
Simo Leone 2007-10-09 03:39:09 -05:00 committed by Dan McGee
parent 521c66d892
commit 703d43da17
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkarchiso
View File

@ -25,6 +25,7 @@ usage ()
echo " general options:" echo " general options:"
echo " -c CONFIG Use CONFIG file. default: /etc/archlive/mkarchiso.conf" echo " -c CONFIG Use CONFIG file. default: /etc/archlive/mkarchiso.conf"
echo " -i CPIO CONFIG Use CONFIG file for mkinitcpio. default: /etc/archlive/mkinitcpio.conf" echo " -i CPIO CONFIG Use CONFIG file for mkinitcpio. default: /etc/archlive/mkinitcpio.conf"
echo " -p PKGFILE DIR Look for package list files in DIR. default: ."
echo " -f Force overwrite of working files / iso" echo " -f Force overwrite of working files / iso"
echo " -v Verbose output. Default: no" echo " -v Verbose output. Default: no"
echo " -h This message." echo " -h This message."
@ -36,10 +37,11 @@ usage ()
exit 1 exit 1
} }
while getopts 'c:i:fvh' arg; do while getopts 'c:i:p:fvh' arg; do
case "${arg}" in case "${arg}" in
c) CONFIG="${OPTARG}" ;; c) CONFIG="${OPTARG}" ;;
i) CPIOCONFIG="${OPTARG}" ;; i) CPIOCONFIG="${OPTARG}" ;;
p) PKGDIR="${OPTARG}" ;;
f) FORCE="y" ;; f) FORCE="y" ;;
v) QUIET="n" ;; v) QUIET="n" ;;
h|?) usage ;; h|?) usage ;;
@ -96,6 +98,9 @@ install_pkgfile ()
toinstall="${toinstall} ${pkg}" toinstall="${toinstall} ${pkg}"
done < ${1} done < ${1}
_pacman "${toinstall}" _pacman "${toinstall}"
else
echo "Package file '${1}' does not exist, aborting..."
exit 1
fi fi
} }
@ -130,7 +135,9 @@ if [ "${command_name}" = "install" -o "${command_name}" = "all" ]; then
kernelver=$(_kversion) kernelver=$(_kversion)
kernelsuffix=${kernelver##*-} kernelsuffix=${kernelver##*-}
echo "Kernel Version ${kernelver} (${kernelsuffix}) installed - installing modules..." echo "Kernel Version ${kernelver} (${kernelsuffix}) installed - installing modules..."
install_pkgfile "modules.${kernelsuffix}" if [ -e "${PKGDIR}/${kernelsuffix}.modules" ]; then
install_pkgfile "${PKGDIR}/${kernelsuffix}.modules"
fi
echo "Updating module dependancies" echo "Updating module dependancies"
[ "${kernelsuffix}" = "ARCH" ] && kernelsuffix="" [ "${kernelsuffix}" = "ARCH" ] && kernelsuffix=""