Changeset 247 for quickinst/quickinst

Timestamp:

23.12.2008 14:17:09 (19 months ago)

Author:

henning

Message:

quickinst: pacman-mirrorlist

File:

• quickinst/quickinst (modified) (4 diffs)

quickinst/quickinst

@@ -89 +89 @@
                 cd $cache
                 echo "  · $1"
-                exec 2>/dev/null # TODO seems to catch not only 2, kind of buggy
-                package=$(ls $1*.tar.gz | tail -1)
+                package=$(ls $1*.pkg.tar.gz 2>/dev/null | tail -1)
                 [ -f "$package" ] && {
                         tar xzf $package -C $target ||
@@ -115 +114 @@
 
 echo · downloading and installing pacman.
-        for package in libdownload libarchive acl attr zlib bzip2 pacman; do
+        for package in libdownload libarchive acl attr zlib bzip2; do
+                install $package
+        done
+        for package in pacman-?. pacman-mirrorlist; do
                 install $package
         done
@@ -123 +125 @@
         cp /etc/resolv.conf etc/resolv.conf
 
-        [ $addpkgs == "" ] && { # TODO source for extra and community
-                echo -e "[core]\nServer = $source" >> /tmp/pacman.conf
-                config="--config /tmp/pacman.conf"
-        }
-
-        mkdir sys proc dev 2> /dev/null
+        mkdir sys proc dev tmp 2> /dev/null
+
+        [ -z "$addpkgs" ] && { # TODO source for extra and community
+                echo -e "[core]\nServer = $source" >> tmp/pacman.conf
+                config="--config tmp/pacman.conf"
+        }
 
         [ $on_arch ] && {
@@ -173 +175 @@
 echo · cleaning up.
         [ -h $cache ] && rm $cache && mkdir $cache
-        rm -f .FILELIST .INSTALL .PKGINFO
         [ $on_arch ] || umount sys proc dev
         mv etc/resolv.conf.pacorig etc/resolv.conf
-        rm -f etc/*.pac*
+        rm -f etc/*.pac* tmp/pac* .FILELIST .INSTALL .PKGINFO
         ln -s . boot/boot