From c681b4dd2376e5d5f1e83da4497094efdaf6268a Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Tue, 14 Mar 2023 22:53:01 -0700 Subject: [PATCH 1/2] Add missing attributes to Cargo.toml --- Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 1f9cf8a..0d5ee80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,9 @@ [package] name = "caligula" +description = "A lightweight, user-friendly disk imaging tool" +homepage = "https://github.com/ifd3f/caligula" +repository = "https://github.com/ifd3f/caligula.git" +authors = ["Astrid Yu "] version = "0.3.0" edition = "2021" license = "GPL-3.0" From f6fbcb583a017f2bcb07994cd4a165deb0294724 Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Tue, 14 Mar 2023 23:53:36 -0700 Subject: [PATCH 2/2] Add some scripts and crap for AUR packaging docker because yeah --- packaging/aur/.gitignore | 2 ++ packaging/aur/Makefile | 15 +++++++++++++++ packaging/aur/README.md | 1 + packaging/aur/dockerenv/Dockerfile | 12 ++++++++++++ packaging/aur/dockerenv/entrypoint.sh | 11 +++++++++++ packaging/aur/inputs/caligula-bin-PKGBUILD | 16 ++++++++++++++++ 6 files changed, 57 insertions(+) create mode 100644 packaging/aur/.gitignore create mode 100644 packaging/aur/Makefile create mode 100644 packaging/aur/README.md create mode 100644 packaging/aur/dockerenv/Dockerfile create mode 100755 packaging/aur/dockerenv/entrypoint.sh create mode 100644 packaging/aur/inputs/caligula-bin-PKGBUILD diff --git a/packaging/aur/.gitignore b/packaging/aur/.gitignore new file mode 100644 index 0000000..913ab99 --- /dev/null +++ b/packaging/aur/.gitignore @@ -0,0 +1,2 @@ +build +/caligula-bin \ No newline at end of file diff --git a/packaging/aur/Makefile b/packaging/aur/Makefile new file mode 100644 index 0000000..3a3fba4 --- /dev/null +++ b/packaging/aur/Makefile @@ -0,0 +1,15 @@ +rootdir=$(shell pwd) + +.PHONY: main +main: inputs dockerimage build caligula-bin + docker run --rm -it -v $(rootdir)/inputs:/inputs:ro -v $(rootdir)/caligula-bin:/caligula-bin caligula-packaging + +caligula-bin: + git clone ssh://aur@aur.archlinux.org/caligula-bin.git + +.PHONY: dockerimage +dockerimage: dockerenv + docker build -t caligula-packaging $< + +build: + mkdir -p build diff --git a/packaging/aur/README.md b/packaging/aur/README.md new file mode 100644 index 0000000..ed29b4b --- /dev/null +++ b/packaging/aur/README.md @@ -0,0 +1 @@ +Included here are some scripts of questionable quality for making the AUR build go brrrr. \ No newline at end of file diff --git a/packaging/aur/dockerenv/Dockerfile b/packaging/aur/dockerenv/Dockerfile new file mode 100644 index 0000000..661038f --- /dev/null +++ b/packaging/aur/dockerenv/Dockerfile @@ -0,0 +1,12 @@ +FROM archlinux + +RUN pacman -Syu --noconfirm \ + base-devel \ + rust \ + sudo + +RUN useradd -m user + +COPY entrypoint.sh /entrypoint.sh + +ENTRYPOINT [ "/entrypoint.sh" ] \ No newline at end of file diff --git a/packaging/aur/dockerenv/entrypoint.sh b/packaging/aur/dockerenv/entrypoint.sh new file mode 100755 index 0000000..3bbc648 --- /dev/null +++ b/packaging/aur/dockerenv/entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -euxo pipefail + +chown -R user /caligula-bin + +{ + cd /caligula-bin + cp /inputs/caligula-bin-PKGBUILD ./PKGBUILD + sudo -u user makepkg --printsrcinfo | tee .SRCINFO +} diff --git a/packaging/aur/inputs/caligula-bin-PKGBUILD b/packaging/aur/inputs/caligula-bin-PKGBUILD new file mode 100644 index 0000000..d2ea351 --- /dev/null +++ b/packaging/aur/inputs/caligula-bin-PKGBUILD @@ -0,0 +1,16 @@ +pkgname=caligula-bin +pkgver=0.3.0 +pkgrel=1 +pkgdesc="A lightweight, user-friendly disk imaging tool" +url="https://github.com/ifd3f/caligula" +license=("GPL-3.0") +arch=("x86_64") +provides=("caligula") +conflicts=("caligula") +source=("https://github.com/ifd3f/caligula/releases/download/v$pkgver/caligula-$CARCH-linux") +sha256sums=("ae1dda2649d7c9152b032b8ded1623bef8705296ea11d6060471ff3f63aa1046") + +package() { + mv caligula-x86_64-linux caligula + install -Dm755 caligula -t "$pkgdir/usr/bin" +}