summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgato_lento2017-04-03 07:36:15 -0500
committergato_lento2017-04-03 07:36:15 -0500
commit6bb4709594900ff721e6c3f1ae28b3e0e187e6a7 (patch)
tree03144efc49c509b678631a1fbccfd56020a6f81f
parent65ce039146bd1a8140074ef04934a0583ecc7302 (diff)
downloadaur-6bb4709594900ff721e6c3f1ae28b3e0e187e6a7.tar.gz
Bump to 1.0.12-1, fix missing icon in about dialog, fix broken help contents link in help menu, minor change to postinstall message
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--axoloti.install4
3 files changed, 12 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e26fb9532d5..a7f9f8eebba1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = axoloti
pkgdesc = Firmware and GUI for the Axoloti Core
- pkgver = 1.0.12
- pkgrel = 2
+ pkgver = 1.0.12_1
+ pkgrel = 1
url = http://www.axoloti.com
install = axoloti.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index f637398836f8..aee0efb5f068 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Based on axoloti-git and axoloti-runtime-git PKGBUILDs by: Joakim Reinert <mail+aur@jreinert.com>
pkgname=axoloti
-pkgver=1.0.12
-pkgrel=2
+pkgver=1.0.12_1
+pkgrel=1
pkgdesc='Firmware and GUI for the Axoloti Core'
arch=('x86_64')
url='http://www.axoloti.com'
@@ -44,7 +44,7 @@ sha512sums=(
build() {
cd $pkgname
- git checkout $pkgver
+ git checkout ${pkgver//_/-}
mkdir -p "$srcdir/${pkgname}-runtime/"{platform_linux/{bin,lib,src},chibios}
cp -r "$srcdir/$_chibios"/* "$srcdir/${pkgname}-runtime/chibios/"
unzip -q -o "$srcdir/${pkgname}-runtime/chibios/ext/fatfs-0.9-patched.zip" -d "$srcdir/${pkgname}-runtime/chibios/ext"
@@ -63,7 +63,9 @@ build() {
make clean
ldd "$srcdir/${pkgname}-runtime/platform_linux/bin/dfu-util"
cd "$srcdir/$pkgname"
- echo '##### building GUI... #####'
+ sed -i "s,doc,/usr/share/doc/$pkgname," src/main/java/axoloti/menus/HelpMenu.java
+ sed -i "s,file:doc,file:///usr/share/$pkgname," src/main/java/resources/about.html
+ echo '##### Building GUI #####'
ant
}
@@ -78,5 +80,7 @@ package() {
install -Dm755 "$srcdir/$pkgname/platform_linux/compile_firmware.sh" "$pkgdir/opt/${pkgname}-runtime/platform_linux/compile_firmware.sh"
install -Dm644 "$srcdir/$pkgname/platform_linux/49-axoloti.rules" "$pkgdir/usr/lib/udev/rules.d/49-axoloti.rules"
install -Dm644 "$srcdir/$pkgname/dist/Axoloti.jar" "$pkgdir/usr/share/$pkgname/Axoloti.jar"
+ install -Dm644 "$srcdir/$pkgname/doc/axoloti_icon.png" "$pkgdir/usr/share/$pkgname/axoloti_icon.png"
+ install -Dm644 "$srcdir/$pkgname/doc/user guide.html" "$pkgdir/usr/share/doc/$pkgname/user guide.html"
install -Dm755 "$srcdir/axoloti.sh" "$pkgdir/usr/bin/axoloti"
}
diff --git a/axoloti.install b/axoloti.install
index 312d98381dd5..a69b2097a9db 100644
--- a/axoloti.install
+++ b/axoloti.install
@@ -1,5 +1,5 @@
compile_firmware() {
- echo '##### compiling firmware... #####'
+ echo '##### Compiling firmware #####'
cd /opt/axoloti-runtime/platform_linux
BUILDDIR=/opt/axoloti-runtime/firmware/build ./compile_firmware.sh
}
@@ -10,7 +10,7 @@ remove_firmware() {
post_install() {
compile_firmware
- echo 'Launch the GUI by running the script at /usr/bin/axoloti'
+ echo -e "\n##### Launch the GUI by running /usr/bin/axoloti #####"
}
post_upgrade() {