X-Git-Url: http://git.annexia.org/?p=febootstrap.git;a=blobdiff_plain;f=src%2Ffebootstrap_pacman.ml;fp=src%2Ffebootstrap_pacman.ml;h=bd12f69cf070368636388cd4d1d2405351ffe028;hp=657f4d7c1445a82a5f85f372d6f2da75ade76766;hb=20a67e4e844a5be640edf3f7f183a89a083e92d0;hpb=65125379903231f1b0c2ccd0929123317c80bcc2

diff --git a/src/febootstrap_pacman.ml b/src/febootstrap_pacman.ml
index 657f4d7..bd12f69 100644
--- a/src/febootstrap_pacman.ml
+++ b/src/febootstrap_pacman.ml
@@ -34,7 +34,7 @@ let pacman_detect () =
 
 let pacman_resolve_dependencies_and_download names =
   let cmd =
-    sprintf "pactree -u %s | sort -u"
+    sprintf "(for p in %s; do pactree -u $p; done) | awk '{print $1}' | sort -u"
       (String.concat " " (List.map Filename.quote names)) in
   let pkgs = run_command_get_lines cmd in
 
@@ -83,13 +83,12 @@ let pacman_list_files ?(use_installed=false) pkg =
   let pkgdir = tmpdir // pkg ^ ".d" in
   mkdir pkgdir 0o755;
   let cmd =
-    sprintf "pacman -Q %s | awk '{print $2}'"
-      pkg in
-   let ver = List.hd (run_command_get_lines cmd) in
-   let cmd =
-     sprintf "umask 0000; fakeroot tar -xf %s-%s* -C %s"
-     (Filename.quote tmpdir // pkg ) ver (Filename.quote pkgdir) in
-   run_command cmd;
+    sprintf "ls -1 %s/%s-*.pkg.* | awk '/\\/%s-[^/-]*-[^/-]*-[^/-]*$/ { print $0 }'"
+      tmpdir pkg pkg in
+  let pkgfile = List.hd (run_command_get_lines cmd) in
+    let cmd = sprintf "umask 0000; fakeroot tar -xf %s -C %s"
+              (Filename.quote pkgfile) (Filename.quote pkgdir) in
+  run_command cmd;
 
   let cmd = sprintf "cd %s && find ." pkgdir in
   let lines = run_command_get_lines cmd in