diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /bootstrap | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap index a47269d87f..de024aeaa5 100755 --- a/bootstrap +++ b/bootstrap @@ -5,8 +5,7 @@ set -e -x # Generate stubs for translations. langs=`find po/doc -type f -name 'guix-manual*.po' \ - | sed -e 's,guix-manual\.,,' \ - | xargs -n 1 -I{} basename {} .po` + | sed -e 's,.*/guix-manual\.,,;s,\.po$,,'` for lang in ${langs}; do if [ ! -e "doc/guix.${lang}.texi" ]; then echo "@setfilename guix.${lang}.info" > "doc/guix.${lang}.texi" @@ -16,8 +15,7 @@ for lang in ${langs}; do fi done langs=`find po/doc -type f -name 'guix-cookbook*.po' \ - | sed -e 's,guix-cookbook\.,,' \ - | xargs -n 1 -I{} basename {} .po` + | sed -e 's,.*/guix-cookbook\.,,;s,\.po$,,'` for lang in ${langs}; do if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then echo "@setfilename guix-cookbook.${lang}.info" > "doc/guix-cookbook.${lang}.texi" |