move akkoma-fe to aur, update packages HEAD main

4 files changed, 4 insertions, 53 deletions

diff --git a/packages/.gitignore b/packages/.gitignore
index ee6a235..213a849 100644
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -7,3 +7,4 @@ fw-ectool-git
 iceshrimp.net
 python-fasttext-predict
 python-pytomlpp
+iceshrimp.net-akkoma-fe-git
diff --git a/packages/aur.ini b/packages/aur.ini
index a7fd674..07392cf 100644
--- a/packages/aur.ini
+++ b/packages/aur.ini
@@ -1,8 +1,9 @@
 cgit-pink = 87afbcd732af921d9127cbbbe4aeb8f823f72d97
 fw-ectool-git = r2763.0ac6155
-iceshrimp.net = 3fa2e550bfd4f75b921fc9a0f29005f4d8d49111
+iceshrimp.net = 99211579c22cb5c3a4fec38703a21f5635158e74
+iceshrimp.net-akkoma-fe-git = 3.10.0.92d3cd4d
 
 ; searxng deps
 python-fasttext-predict = 043cd051e2e43ba72a9776745fde07bbb290d44a
-python-httpx-socks = bad01dbdd429fe4e14694a55f911f7810d7a39de
+python-httpx-socks = 466b79d357e6743dd06abdf0a81724fc7627ba7d
 python-pytomlpp = d021d021f4d38927799f38e1c91e10d70b94257b
diff --git a/packages/iceshrimp.net-akkoma-fe-git/.gitignore b/packages/iceshrimp.net-akkoma-fe-git/.gitignore
deleted file mode 100644
index b40d819..0000000
--- a/packages/iceshrimp.net-akkoma-fe-git/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/akkoma-fe/
-/*.pkg.*
diff --git a/packages/iceshrimp.net-akkoma-fe-git/PKGBUILD b/packages/iceshrimp.net-akkoma-fe-git/PKGBUILD
deleted file mode 100644
index 6335a3b..0000000
--- a/packages/iceshrimp.net-akkoma-fe-git/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-pkgname=iceshrimp.net-akkoma-fe-git
-pkgver=3.10.0.92d3cd4d
-pkgrel=1
-license=(AGPL)
-arch=(any)
-makedepends=(nodejs)
-source=(akkoma-fe::git+https://iceshrimp.dev/iceshrimp/akkoma-fe.git)
-sha256sums=(SKIP)
-
-pkgver() {
-  cd akkoma-fe
-  echo "$(jq -r '.version' package.json).$(git rev-parse --short HEAD)"
-}
-
-build() {
-  cd akkoma-fe
-  corepack yarn
-  corepack yarn build
-}
-
-take-static() {
-  mv "$srcdir/akkoma-fe/dist/static/$1" "$srcdir/$1"
-}
-
-put-static() {
-  ln -s "/etc/iceshrimp.net/akkoma-fe/$1" "$pkgdir/usr/share/iceshrimp.net/akkoma-fe/static/$1"
-  install -Dm644 "$srcdir/$1" "$pkgdir/etc/iceshrimp.net/akkoma-fe/$1"
-}
-
-package() {
-  install -dm644 "$pkgdir/usr/share/iceshrimp.net/akkoma-fe/static"
-
-  # split out configurables into /etc
-  install -dm755 "$pkgdir/etc/iceshrimp.net/akkoma-fe"
-
-  take-static terms-of-service.html
-  sed -i 's|$STATIC_DIR/static/terms-of-service.html|/etc/iceshrimp.net/akkoma-fe/terms-of-service.html|' "$srcdir/terms-of-service.html"
-  put-static terms-of-service.html
-
-  take-static config.json && put-static config.json
-  take-static styles.json && put-static styles.json
-
-  take-static custom.css
-  sed -i 's|$static_dir/static/custom.css|/etc/iceshrimp.net/akkoma-fe/custom.css|' "$srcdir/custom.css"
-  put-static custom.css
-
-  # install compiled artifacts
-  cp -dpTr --no-preserve=ownership "$srcdir/akkoma-fe/dist" "$pkgdir/usr/share/iceshrimp.net/akkoma-fe"
-}