Author: NicolasPierron
Date: Sun Apr 17 08:27:09 2011
New Revision: 26862
URL: https://svn.nixos.org/websvn/nix/?rev=26862&sc=1

Log:
texlive Aggregate:
- Add bouncer to binaries stored in /bin directory.
- Avoid manipulation of patterns as a match.

Modified:
   nixpkgs/trunk/pkgs/misc/tex/texlive/aggregate.nix

Modified: nixpkgs/trunk/pkgs/misc/tex/texlive/aggregate.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/tex/texlive/aggregate.nix   Sun Apr 17 08:27:04 
2011        (r26861)
+++ nixpkgs/trunk/pkgs/misc/tex/texlive/aggregate.nix   Sun Apr 17 08:27:09 
2011        (r26862)
@@ -7,6 +7,7 @@
 
   doAggregate = fullDepEntry (''
 
+    ensureDir $out/bin
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
         find $currentPath/share/info $currentPath/share/man $(echo 
$currentPath/texmf*/) ! -type d | while read; do
@@ -15,6 +16,13 @@
            ln -fs $currentPath/"$REPLY" $out/"$REPLY"
            echo
         done | while read; do head -n 99 >/dev/null; echo -n .; done
+
+        for i in $currentPath/bin/* :; do #*/
+            test "$i" = : && continue;
+            echo -ne "#! /bin/sh\\n$i \"\$@\"" > "$out/bin/$(basename "$i")" 
&& \
+            chmod a+x "$out/bin/$(basename "$i")"
+        done
+
        echo
 
        cp -Trfp $currentPath/libexec $out/libexec || true
@@ -28,8 +36,8 @@
       ensureDir $out/texmf-config/"$REPLY"
     done
 
-    ensureDir $out/bin
-    for i in $out/libexec/*/*; do
+    for i in $out/libexec/*/* :; do
+        test "$i" = : && continue;
         test -f "$i" && \
        test -x "$i" && \
        echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i) && \
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to