Fix epub generation

* Hydra doesn't like spaces in filenames.

* The zip file contained nix/store/.../OEBPS rather than OEBPS at
top-level, causing some programs (like okular) to barf.

* Remove the redundant $dst/epub directory.

+6 -3
+6 -3
nixos/doc/manual/default.nix
··· 221 221 mkdir -p $dst/epub/OEBPS/images/callouts 222 222 cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts 223 223 echo "application/epub+zip" > mimetype 224 - zip -0Xq "$dst/NixOS Manual - NixOS community.epub" mimetype 225 - zip -Xr9D "$dst/NixOS Manual - NixOS community.epub" $dst/epub/* 224 + manual="$dst/nixos-manual.epub" 225 + zip -0Xq "$manual" mimetype 226 + cd $dst/epub && zip -Xr9D "$manual" * 227 + 228 + rm -rf $dst/epub 226 229 227 230 mkdir -p $out/nix-support 228 - echo "doc-epub manual $dst/NixOS Manual - NixOS community.epub" >> $out/nix-support/hydra-build-products 231 + echo "doc-epub manual $manual" >> $out/nix-support/hydra-build-products 229 232 ''; 230 233 }; 231 234