root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'changed tabs to spaces in quickinst'

Browse source
This commit is contained in:
Tobias Powalowski 2009-02-11 21:34:04 +01:00
parent 183d164fd9
commit 441ccfb656
1 changed files with 66 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
usr/share/archboot/installer/quickinst
View file

@ -1,33 +1,33 @@
#! /bin/sh #! /bin/sh
usage() { usage() {
echo "quickinst <install_mode> <destdir> <package_directory|server_url>" echo "quickinst <install_mode> <destdir> <package_directory|server_url>"
echo echo
echo "This script is for users who would rather partition/mkfs/mount their target" echo "This script is for users who would rather partition/mkfs/mount their target"
echo "media manually than go through the routines in the setup script." echo "media manually than go through the routines in the setup script."
echo echo
echo "First make sure you have all your filesystems mounted under <destdir>." echo "First make sure you have all your filesystems mounted under <destdir>."
echo "e.g. mount -t iso9660 /dev/hdc or /dev/sr0 (for new naming sheme) /src " echo "e.g. mount -t iso9660 /dev/hdc or /dev/sr0 (for new naming sheme) /src "
echo "Then run this script to install all base packages to <destdir>." echo "Then run this script to install all base packages to <destdir>."
echo echo
if [ -e /usr/bin/wget ]; then if [ -e /usr/bin/wget ]; then
echo "<install_mode> must be either 'ftp' or 'media'" echo "<install_mode> must be either 'ftp' or 'media'"
else else
echo "<install_mode> must be 'media'" echo "<install_mode> must be 'media'"
fi fi
echo echo
echo "Examples:" echo "Examples:"
if [ -e /usr/bin/wget ]; then if [ -e /usr/bin/wget ]; then
if [ "$(uname -m)" = "x86_64" ]; then if [ "$(uname -m)" = "x86_64" ]; then
echo " quickinst ftp /mnt ftp://ftp.archlinux.org/core/os/x86_64" echo " quickinst ftp /mnt ftp://ftp.archlinux.org/core/os/x86_64"
else else
echo " quickinst ftp /mnt ftp://ftp.archlinux.org/core/os/i686" echo " quickinst ftp /mnt ftp://ftp.archlinux.org/core/os/i686"
fi fi
fi fi
echo " quickinst media /mnt /src/core-$(uname -m)/pkg" echo " quickinst media /mnt /src/core-$(uname -m)/pkg"
echo "" echo ""
exit 0 exit 0
} }
INSTMODE=$1 INSTMODE=$1
@ -37,38 +37,38 @@ PKGARG=$3
PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar" PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar"
if [ "$PKGARG" = "" ]; then if [ "$PKGARG" = "" ]; then
usage usage
fi fi
! [ -d /tmp ] && mkdir /tmp ! [ -d /tmp ] && mkdir /tmp
if [ "$INSTMODE" = "ftp" ]; then if [ "$INSTMODE" = "ftp" ]; then
echo "[core]" >/tmp/pacman.conf echo "[core]" >/tmp/pacman.conf
echo "Server = $PKGARG" >>/tmp/pacman.conf echo "Server = $PKGARG" >>/tmp/pacman.conf
mkdir -p $DESTDIR/var/cache/pacman/pkg /var/cache/pacman >/dev/null 2>&1 mkdir -p $DESTDIR/var/cache/pacman/pkg /var/cache/pacman >/dev/null 2>&1
rm -f /var/cache/pacman/pkg >/dev/null 2>&1 rm -f /var/cache/pacman/pkg >/dev/null 2>&1
ln -sf $DESTDIR/var/cache/pacman/pkg /var/cache/pacman/pkg >/dev/null 2>&1 ln -sf $DESTDIR/var/cache/pacman/pkg /var/cache/pacman/pkg >/dev/null 2>&1
fi fi
if [ "$INSTMODE" = "media" ]; then if [ "$INSTMODE" = "media" ]; then
PKGFILE=/tmp/packages.txt PKGFILE=/tmp/packages.txt
cp $PKGARG/packages.txt /tmp/packages.txt cp $PKGARG/packages.txt /tmp/packages.txt
if [ ! -f $PKGFILE ]; then if [ ! -f $PKGFILE ]; then
echo "error: Could not find package list: $PKGFILE" echo "error: Could not find package list: $PKGFILE"
exit 1 exit 1
fi fi
echo "[core]" >/tmp/pacman.conf echo "[core]" >/tmp/pacman.conf
echo "Server = file://$PKGARG" >>/tmp/pacman.conf echo "Server = file://$PKGARG" >>/tmp/pacman.conf
mkdir -p $DESTDIR/var/cache/pacman/pkg /var/cache/pacman >/dev/null 2>&1 mkdir -p $DESTDIR/var/cache/pacman/pkg /var/cache/pacman >/dev/null 2>&1
rm -f /var/cache/pacman/pkg >/dev/null 2>&1 rm -f /var/cache/pacman/pkg >/dev/null 2>&1
ln -sf $PKGARG /var/cache/pacman/pkg >/dev/null 2>&1 ln -sf $PKGARG /var/cache/pacman/pkg >/dev/null 2>&1
PKGLIST= PKGLIST=
# fix pacman list! # fix pacman list!
sed -i -e 's/-i686//g' -e 's/-x86_64//g' $PKGFILE sed -i -e 's/-i686//g' -e 's/-x86_64//g' $PKGFILE
for i in $(cat $PKGFILE | grep 'base/' | cut -d/ -f2); do for i in $(cat $PKGFILE | grep 'base/' | cut -d/ -f2); do
nm=${i%-*-*} nm=${i%-*-*}
PKGLIST="$PKGLIST $nm" PKGLIST="$PKGLIST $nm"
done done
fi fi
! [ -d $DESTDIR/var/lib/pacman ] && mkdir -p $DESTDIR/var/lib/pacman ! [ -d $DESTDIR/var/lib/pacman ] && mkdir -p $DESTDIR/var/lib/pacman
! [ -d /var/lib/pacman ] && mkdir -p /var/lib/pacman ! [ -d /var/lib/pacman ] && mkdir -p /var/lib/pacman
@ -86,11 +86,11 @@ if [ "$INSTMODE" = "ftp" ]; then
$PACMAN -Sy base $PACMAN -Sy base
fi fi
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
echo echo
echo "Package installation FAILED." echo "Package installation FAILED."
echo echo
umount $DESTDIR/proc $DESTDIR/sys $DESTDIR/dev umount $DESTDIR/proc $DESTDIR/sys $DESTDIR/dev
exit 1 exit 1
fi fi
### HACK to fix infofiles in bash and texinfo! ### HACK to fix infofiles in bash and texinfo!
#echo "Workaround for fixing bash and texinfo infofiles..." #echo "Workaround for fixing bash and texinfo infofiles..."
@ -135,3 +135,5 @@ echo "Then exit your chroot shell, edit $DESTDIR/etc/fstab and"
echo "$DESTDIR/etc/rc.conf, and reboot!" echo "$DESTDIR/etc/rc.conf, and reboot!"
echo echo
exit 0 exit 0
# vim: set ts=4 sw=4 et: