version 0.1.3

3 files changed, 37 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a93725c4dd4..70894fac999c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = paclan
 	pkgdesc = Share pacman packages on the LAN. A replacement for pacserve
-	pkgver = 0.1.2
+	pkgver = 0.1.3
 	pkgrel = 1
-	url = https://github.com/rakoo/paclan
+	url = https://github.com/Kunde21/paclan
 	install = paclan.install
 	arch = i686
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = armv7l
 	license = CC0
 	makedepends = go
-	source = https://github.com/rakoo/paclan/archive/v0.1.2.zip
-	sha256sums = 29efca936520d4e8458ffbc758cdbb7992e944a7a7dbcfccce54c13229a8c997
+	source = ${pkgname}::https://github.com/Kunde21/paclan/archive/v${pkgver}.tar.gz
+	sha256sums = b43d34a62618d0c3ed9027a5bb5d3434c864348ddd08a716eb1ee4fcf0d0c73a
 
 pkgname = paclan
 
diff --git a/PKGBUILD b/PKGBUILD
index 40b35d6b7103..03bdd59e457e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
-# Maintainer: Matthieu Rakotojaona <matthieu.rakotojaona@gmail.com>
+# Maintainer: Chad Kunde <Kunde21@gmail.com>
+# Contributor: Matthieu Rakotojaona <matthieu.rakotojaona@gmail.com>
 
 pkgname=paclan
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=1
 epoch=
 pkgdesc='Share pacman packages on the LAN. A replacement for pacserve'
-arch=('i686' 'x86_64')
-url='https://github.com/rakoo/paclan'
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv7l')
+url='https://github.com/Kunde21/paclan'
 license=('CC0')
 groups=()
 makedepends=('go')
-source=("https://github.com/rakoo/paclan/archive/v${pkgver}.zip")
-sha256sums=(29efca936520d4e8458ffbc758cdbb7992e944a7a7dbcfccce54c13229a8c997)
+source=('${pkgname}::https://github.com/Kunde21/paclan/archive/v${pkgver}.tar.gz')
+sha256sums=('b43d34a62618d0c3ed9027a5bb5d3434c864348ddd08a716eb1ee4fcf0d0c73a')
 install=paclan.install
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  go build -o paclan
+  cd "${pkgname}-${pkgver}"
+  go build --trimpath -o paclan
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${pkgname}-${pkgver}"
 
   # systemctl service file
   install -D -m644  'paclan.service' "$pkgdir/usr/lib/systemd/system/paclan.service"
@@ -28,6 +29,9 @@ package() {
   # paclan binary
   install -D -m755 'paclan' "$pkgdir/usr/bin/$pkgname"
 
+  # mirrorlist.paclan
+  install -D -m644 'mirrorlist.paclan' "$pkgdir/etc/pacman.d/mirrorlist.paclan"
+
   # paclan.conf
   install -D -m644 'paclan.conf' "$pkgdir/etc/pacman.d/paclan.conf"
 
diff --git a/paclan.install b/paclan.install
index 874952db4c2b..7a6b98d658d5 100644
--- a/paclan.install
+++ b/paclan.install
@@ -4,12 +4,27 @@ post_install()
   systemctl start paclan.service
 
   echo "Don't forget to edit /etc/pacman.conf and include
-    Include = /etc/pacman.d/paclan.conf
+    Include = /etc/pacman.d/mirrorlist.paclan
 to each repo where you would like to see paclan being used (that would be at least [core], [extra] and [community])"
 }
 
+post_update()
+{
+  echo "Attempting to automatically migrate pacman.conf to mirrorlist.paclan"
+  sed -i 's|/etc/pacman.d/paclan.conf|/etc/pacman.d/mirrorlist.paclan|g' /etc/pacman.conf
+
+  echo "Please check that the repos in /etc/pacman.conf has been updated to use the line
+    Include = /etc/pacman.d/mirrorlist.paclan
+in each repo where you would like paclan used (suggested: at least [core], [extra] and [community])"
+}
+
 pre_remove()
 {
+  echo "Attempting to automatically update pacman.conf"
+
+  sed -i 's|Include\s*=\s*/etc/pacman.d/paclan.conf|# \0|g' /etc/pacman.conf
+  sed -i 's|Include\s*=\s*/etc/pacman.d/mirrorlist.paclan|# \0|g' /etc/pacman.conf
+
   systemctl stop paclan.service
   systemctl disable paclan.service
 }
@@ -17,6 +32,6 @@ pre_remove()
 post_remove()
 {
   echo "Don't forget to remove the additional Include lines from /etc/pacman.conf. They should look like:
-    Include = /etc/pacman.d/paclan.conf"
+    Include = /etc/pacman.d/mirrorlist.paclan"
   systemctl daemon-reload
 }