diff --git a/RoboFile.php b/RoboFile.php index cd2c7a9..4e1cdb5 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -171,8 +171,6 @@ class RoboFile extends \Robo\Tasks { // get useable version strings from Git $version = trim(`git -C "$dir" describe --tags`); $archVersion = preg_replace('/^([^-]+)-(\d+)-(\w+)$/', "$1.r$2.$3", $version); - // generate manpages - $t->addTask($this->taskExec("./robo manpage")->dir($dir)); // name the generic release tarball $tarball = "arsse-$version.tar.gz"; // generate the Debian changelog; this also validates our original changelog @@ -187,7 +185,9 @@ class RoboFile extends \Robo\Tasks { $t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^source=\("arsse-[^"]+"\)$/m')->to('source=("'.basename($tarball).'")')); // perform Composer installation in the temp location with dev dependencies $t->addTask($this->taskComposerInstall()->arg("-q")->dir($dir)); - // generate the manual + // generate manpages + $t->addTask($this->taskExec("./robo manpage")->dir($dir)); + // generate the HTML manual $t->addTask($this->taskExec("./robo manual -q")->dir($dir)); // perform Composer installation in the temp location for final output $t->addTask($this->taskComposerInstall()->dir($dir)->noDev()->optimizeAutoloader()->arg("--no-scripts")->arg("-q")); diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index a264a3e..ad4b671 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -42,7 +42,7 @@ package() { cp dist/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf" cp dist/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" cp dist/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf" - cp dist/manpage "$pkgdir/usr/share/man/man1/arsse.1" + cp -T dist/manpage "$pkgdir/usr/share/man/man1/arsse.1" cp -r dist/nginx dist/apache config.defaults.php "$pkgdir/etc/webapps/arsse" cd "$pkgdir" # copy files requiring special permissions diff --git a/dist/arch/PKGBUILD-git b/dist/arch/PKGBUILD-git index fb25a49..104a299 100644 --- a/dist/arch/PKGBUILD-git +++ b/dist/arch/PKGBUILD-git @@ -59,7 +59,7 @@ package() { cp dist/sysuser.conf "$pkgdir/usr/lib/sysusers.d/arsse.conf" cp dist/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/arsse.conf" cp dist/php-fpm.conf "$pkgdir/etc/php/php-fpm.d/arsse.conf" - cp dist/manpage "$pkgdir/usr/share/man/man1/arsse.1" + cp -T dist/manpage "$pkgdir/usr/share/man/man1/arsse.1" cp -r dist/nginx dist/apache config.defaults.php "$pkgdir/etc/webapps/arsse" cd "$pkgdir" # copy files requiring special permissions