diff --git a/.gitignore b/.gitignore index 4d9f94f..f27a43f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,3 @@ gdb.txt # Generated docs _docs/ -/man/ diff --git a/.woodpecker/.man.yml b/.woodpecker/.man.yml deleted file mode 100644 index 0b80886..0000000 --- a/.woodpecker/.man.yml +++ /dev/null @@ -1,36 +0,0 @@ -platform: 'linux/amd64' -branches: - exclude: [ main ] - -depends_on: - - build - -skip_clone: true - -pipeline: - generate: - image: 'chewingbever/vlang:latest' - pull: true - commands: - - curl -o vieter -L "https://s3.rustybever.be/vieter/commits/$CI_COMMIT_SHA/vieter-linux-amd64" - - chmod +x vieter - - ./vieter man man - - cd man - - # Generate an HTML page from each man page - - for f in $(ls -1 *.1); do mandoc -Thtml -O style=mandoc.css,man=%N.%S.html $f > "$f.html"; done - - # Download the mandoc.css file from the official site - - curl -o mandoc.css -L https://mandoc.bsd.lv/mandoc.css - - - tar czvf ../man.tar.gz *.html mandoc.css - - deploy: - image: 'curlimages/curl' - secrets: - - 'site_api_key' - commands: - - 'curl -XPOST --fail -s -H "Authorization: Bearer $SITE_API_KEY" -T man.tar.gz https://rustybever.be/api/deploy?dir=man-vieter' - when: - event: push - branch: dev diff --git a/CHANGELOG.md b/CHANGELOG.md index 93e566a..affd5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,9 +15,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * GitRepo: filter by repo * BuildLog: filter by start & end date, repo, exit code & arch * CLI flags to take advantage of above API improvements -* Added CLI command to generate all man pages -* PKGBUILDs now install man pages -* CLI man pages are now hosted on https://rustybever.be ### Changed diff --git a/Makefile b/Makefile index 7eb3547..199b99e 100644 --- a/Makefile +++ b/Makefile @@ -60,11 +60,6 @@ api-docs: rm -rf '$(SRC_DIR)/_docs' cd '$(SRC_DIR)' && v doc -all -f html -m -readme . -.PHONY: man -man: vieter - rm -rf man - ./vieter man man - # =====OTHER===== .PHONY: lint diff --git a/PKGBUILD b/PKGBUILD index 656d9d4..49fcf54 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,6 @@ pkgbase='vieter' pkgname='vieter' pkgver='0.3.0_alpha.2' pkgrel=1 -pkgdesc="Vieter is a lightweight implementation of an Arch repository server." depends=('glibc' 'openssl' 'libarchive' 'sqlite') makedepends=('git' 'vieter-v') arch=('x86_64' 'aarch64') @@ -18,17 +17,11 @@ build() { cd "$pkgname" make prod - - # The default CFLAGS for some reason causes vieter to segfault if used - # inside the PKGBUILD. As a workaround, we use tcc to build a debug build - # that does work, so we can generate the manpages. - CFLAGS= LDFLAGS= make man } package() { + pkgdesc="Vieter is a lightweight implementation of an Arch repository server." + install -dm755 "$pkgdir/usr/bin" install -Dm755 "$pkgname/pvieter" "$pkgdir/usr/bin/vieter" - - install -dm755 "$pkgdir/usr/share/man/man1" - install -Dm644 "$pkgname/man"/*.1 "$pkgdir/usr/share/man/man1" } diff --git a/PKGBUILD.dev b/PKGBUILD.dev index d25abb3..d0176d8 100644 --- a/PKGBUILD.dev +++ b/PKGBUILD.dev @@ -5,7 +5,6 @@ pkgbase='vieter-git' pkgname='vieter-git' pkgver=0.2.0.r25.g20112b8 pkgrel=1 -pkgdesc="Vieter is a lightweight implementation of an Arch repository server." depends=('glibc' 'openssl' 'libarchive' 'sqlite') makedepends=('git' 'vieter-v') arch=('x86_64' 'aarch64') @@ -26,17 +25,11 @@ build() { cd "$pkgname" make prod - - # The default CFLAGS for some reason causes vieter to segfault if used - # inside the PKGBUILD. As a workaround, we use tcc to build a debug build - # that does work, so we can generate the manpages. - CFLAGS= LDFLAGS= make man } package() { + pkgdesc="Vieter is a lightweight implementation of an Arch repository server." + install -dm755 "$pkgdir/usr/bin" install -Dm755 "$pkgname/pvieter" "$pkgdir/usr/bin/vieter" - - install -dm755 "$pkgdir/usr/share/man/man1" - install -Dm644 "$pkgname/man"/*.1 "$pkgdir/usr/share/man/man1" } diff --git a/src/console/console.v b/src/console/console.v index 7d782ba..dfb2fac 100644 --- a/src/console/console.v +++ b/src/console/console.v @@ -2,8 +2,6 @@ module console import arrays import strings -import cli -import os // pretty_table converts a list of string data into a pretty table. Many thanks // to @hungrybluedev in the Vlang Discord for providing this code! @@ -56,15 +54,3 @@ pub fn pretty_table(header []string, data [][]string) ?string { return buffer.str() } - -// export_man_pages recursively generates all man pages for the given -// cli.Command & writes them to the given directory. -pub fn export_man_pages(cmd cli.Command, path string) ? { - man := cmd.manpage() - os.write_file(os.join_path_single(path, cmd.full_name().replace(' ', '-') + '.1'), - man)? - - for sub_cmd in cmd.commands { - export_man_pages(sub_cmd, path)? - } -} diff --git a/src/console/man/man.v b/src/console/man/man.v deleted file mode 100644 index d91a140..0000000 --- a/src/console/man/man.v +++ /dev/null @@ -1,21 +0,0 @@ -module man - -import cli -import console -import os - -// cmd returns the cli submodule that handles generating man pages. -pub fn cmd() cli.Command { - return cli.Command{ - name: 'man' - description: 'Generate all man pages & save them in the given directory.' - usage: 'dir' - required_args: 1 - execute: fn (cmd cli.Command) ? { - root := cmd.root() - os.mkdir_all(cmd.args[0])? - - console.export_man_pages(root, cmd.args[0])? - } - } -} diff --git a/src/main.v b/src/main.v index 80c1955..885e0f3 100644 --- a/src/main.v +++ b/src/main.v @@ -6,7 +6,6 @@ import cli import console.git import console.logs import console.schedule -import console.man import cron fn main() { @@ -30,7 +29,6 @@ fn main() { cron.cmd(), logs.cmd(), schedule.cmd(), - man.cmd(), ] } app.setup()