summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordangersalad2019-02-04 10:22:40 -0700
committerdangersalad2019-02-04 10:22:40 -0700
commit22eee5052ed35988f48ea59eb10ed096f8ad26bb (patch)
tree847201e4d216ca18c7e3dbdcaac1e28190d25a80
parent31bd3f835d95ade677514ccbe9d3a7bd74cbe1fc (diff)
downloadaur-22eee5052ed35988f48ea59eb10ed096f8ad26bb.tar.gz
update to 0.45.2
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD29
-rw-r--r--megamek.sh4
-rw-r--r--mekhq.sh4
-rw-r--r--mm-server.patch48
-rw-r--r--mm-startup.patch48
6 files changed, 21 insertions, 126 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74bd452c10f..4f873fec91c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mekhq
pkgdesc = MekHQ is a java helper program for the MegaMek game that allows users to load a list of entities from an XML file, perform repairs and customizations, and then save the new entities to another XML file that can be loaded into MegaMek.
- pkgver = 0.44.0
+ pkgver = 0.45.2
pkgrel = 1
url = https://github.com/MegaMek/mekhq
arch = x86_64
@@ -8,20 +8,16 @@ pkgbase = mekhq
depends = jdk10-openjdk
provides = megamek
conflicts = megamek
- source = https://github.com/MegaMek/mekhq/releases/download/v0.44.0/mekhq-0.44.0.tar.gz
+ source = https://github.com/MegaMek/mekhq/releases/download/v0.45.2/mekhq-0.45.2.tar.gz
source = mekhq.desktop
source = megamek.desktop
- source = mm-startup.patch
- source = mm-server.patch
source = mekhq.sh
source = megamek.sh
- sha256sums = 2e51546d94e58532fcfaf1481f15da862b8d70c741687cb4a149f171cca6f08a
+ sha256sums = 92fe5fa29fea85b5156eb7ea0d364eed4dff059b8328ab9b3f70ffbc77c8a957
sha256sums = a6c0cc72c6f3ad773bdcec24c8036ae7d09dcaea4908f5b6d4e5ac6091cff772
sha256sums = caf5bf3e7294029c7b6dec974eed0253d6caf3804a6a9fcc953edc3c9be98b16
- sha256sums = 113d6fe539108d172db238abd6a316be55d6d1af92cf0bcb4555b7cb70427908
- sha256sums = b964aa25672d5311b98f51ae7e895f32501092bcd5382979a4af45ba3436b5ba
- sha256sums = 056b528fb478966d32eaa36354335f667a73776975ebf57794f4f992e72f41c3
- sha256sums = 7c1988808f166dca21732a6d5679acdeb55520e3bb4babcc0b0b7c1e8b671f52
+ sha256sums = fda6e9d542062041e9d9b7f6331069d8a78b9455a290286aa8d214ed66b13fd7
+ sha256sums = 9ad4d0251ecfe02140c46dfeb67a4ce2b0fe9f123b04a3911139b8e255ff2beb
pkgname = mekhq
diff --git a/PKGBUILD b/PKGBUILD
index e7914457167..7498a73f0e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Paul Davis <paul@dangersalad.com>
pkgname=mekhq
-pkgver=0.44.0
+pkgver=0.45.2
_pkgver=
pkgrel=1
epoch=
@@ -17,18 +17,14 @@ conflicts=('megamek')
source=("https://github.com/MegaMek/mekhq/releases/download/v${pkgver}/${pkgname}-${pkgver}${_pkgver}.tar.gz"
"mekhq.desktop"
"megamek.desktop"
- "mm-startup.patch"
- "mm-server.patch"
"mekhq.sh"
"megamek.sh")
-sha256sums=('2e51546d94e58532fcfaf1481f15da862b8d70c741687cb4a149f171cca6f08a'
+sha256sums=('92fe5fa29fea85b5156eb7ea0d364eed4dff059b8328ab9b3f70ffbc77c8a957'
'a6c0cc72c6f3ad773bdcec24c8036ae7d09dcaea4908f5b6d4e5ac6091cff772'
'caf5bf3e7294029c7b6dec974eed0253d6caf3804a6a9fcc953edc3c9be98b16'
- '113d6fe539108d172db238abd6a316be55d6d1af92cf0bcb4555b7cb70427908'
- 'b964aa25672d5311b98f51ae7e895f32501092bcd5382979a4af45ba3436b5ba'
- '056b528fb478966d32eaa36354335f667a73776975ebf57794f4f992e72f41c3'
- '7c1988808f166dca21732a6d5679acdeb55520e3bb4babcc0b0b7c1e8b671f52')
+ 'fda6e9d542062041e9d9b7f6331069d8a78b9455a290286aa8d214ed66b13fd7'
+ '9ad4d0251ecfe02140c46dfeb67a4ce2b0fe9f123b04a3911139b8e255ff2beb')
package() {
@@ -41,17 +37,12 @@ package() {
install -D "${pkgname}-${pkgver}${_pkgver}/MekHQ.jar" \
"${pkgdir}/usr/lib/${pkgname}/MekHQ.jar"
- patch "${pkgname}-${pkgver}${_pkgver}/mm-startup.sh" mm-startup.patch
- patch "${pkgname}-${pkgver}${_pkgver}/mm-server.sh" mm-server.patch
-
- install -Dm755 "${pkgname}-${pkgver}${_pkgver}/mm-startup.sh" \
- "${pkgdir}/usr/lib/${pkgname}/mm-startup.sh"
- install -Dm755 "${pkgname}-${pkgver}${_pkgver}/mm-server.sh" \
- "${pkgdir}/usr/lib/${pkgname}/mm-server.sh"
- install -Dm755 "${pkgname}-${pkgver}${_pkgver}/hq.sh" \
- "${pkgdir}/usr/lib/${pkgname}/hq.sh"
- install -Dm755 "${pkgname}-${pkgver}${_pkgver}/lab.sh" \
- "${pkgdir}/usr/lib/${pkgname}/lab.sh"
+ install -Dm755 "${pkgname}-${pkgver}${_pkgver}/mm-startup" \
+ "${pkgdir}/usr/lib/${pkgname}/mm-startup"
+ install -Dm755 "${pkgname}-${pkgver}${_pkgver}/hq" \
+ "${pkgdir}/usr/lib/${pkgname}/hq"
+ install -Dm755 "${pkgname}-${pkgver}${_pkgver}/lab" \
+ "${pkgdir}/usr/lib/${pkgname}/lab"
cp -r "${pkgname}-${pkgver}${_pkgver}/campaigns" "${pkgdir}/usr/lib/${pkgname}"
diff --git a/megamek.sh b/megamek.sh
index b4b2a9e6517..6f5c20a1b88 100644
--- a/megamek.sh
+++ b/megamek.sh
@@ -14,4 +14,6 @@ fi
rsync -avc /usr/lib/mekhq/ "$conf/"
-exec env MEGAMEK_CONFPATH="$conf" "$conf/mm-startup.sh"
+cd "$conf"
+
+exec env MEGAMEK_CONFPATH="$conf" "$conf/mm-startup"
diff --git a/mekhq.sh b/mekhq.sh
index 59bf5a869de..1e0d1902b40 100644
--- a/mekhq.sh
+++ b/mekhq.sh
@@ -14,4 +14,6 @@ fi
rsync -avc /usr/lib/mekhq/ "$conf/"
-exec env MEGAMEK_CONFPATH="$conf" "$conf/hq.sh"
+cd "$conf"
+
+exec env MEGAMEK_CONFPATH="$conf" "$conf/hq"
diff --git a/mm-server.patch b/mm-server.patch
deleted file mode 100644
index e09fd4bb9c0..00000000000
--- a/mm-server.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-60,66c60
-< if ! test -z "$MEGAMEK_CONFPATH"; then
-< if ! test -d "/.$MEGAMEK_CONFPATH" -a \
-< -f "/.$MEGAMEK_CONFPATH/$MEGAMEK_DEFAULT_JARNAME"; then
-< echo "Relative path: $MEGAMEK_CONFPATH. Clearing."
-< MEGAMEK_CONFPATH=""
-< fi
-< fi
----
-> # MEGAMEK_CONFPATH may be set before hand, which is not desired.
-68,79c62,67
-< temp_path=$MEGAMEK_DEFAULT_CONFPATH
-< if test -d $temp_path; then
-< MEGAMEK_CONFPATH=$temp_path
-< else
-< # See if we should create the default configuration directory.
-< if test -d $MEGAMEK_DEFAULT_CONFROOT -a \
-< -w $MEGAMEK_DEFAULT_CONFROOT; then
-< mkdir $temp_path
-< if test -d $temp_path; then
-< MEGAMEK_CONFPATH=$temp_path
-< fi
-< fi
----
-> conf=$HOME/.config/mekhq
->
-> if [[ -n "$XGD_CONFIG_HOME" ]]
-> then
-> conf="$XDG_CONFIG_HOME/mekhq"
-> fi
-81,86c69,71
-< # If MEGAMEK_CONFPATH is still not set, try the PWD.
-< if test -z "$MEGAMEK_CONFPATH"; then
-< if test -w $PWD; then
-< MEGAMEK_CONFPATH=$PWD
-< fi
-< fi
----
-> if [[ ! -d "$conf" ]]
-> then
-> mkdir -p "$conf"
-87a73,74
->
-> MEGAMEK_CONFPATH="$conf"
-91c78
-< if test -z "$MEGAMEK_CONFPATH"; then
----
-> if ! test -d "$MEGAMEK_CONFPATH"; then
diff --git a/mm-startup.patch b/mm-startup.patch
deleted file mode 100644
index 21f9080f5f1..00000000000
--- a/mm-startup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-59,65c59
-< if ! test -z "$MEGAMEK_CONFPATH"; then
-< if ! test -d "/.$MEGAMEK_CONFPATH" -a \
-< -f "/.$MEGAMEK_CONFPATH/$MEGAMEK_DEFAULT_JARNAME"; then
-< echo "Relative path: $MEGAMEK_CONFPATH. Clearing."
-< MEGAMEK_CONFPATH=""
-< fi
-< fi
----
-> # MEGAMEK_CONFPATH may be set before hand, which is not desired.
-67,78c61,66
-< temp_path=$MEGAMEK_DEFAULT_CONFPATH
-< if test -d $temp_path; then
-< MEGAMEK_CONFPATH=$temp_path
-< else
-< # See if we should create the default configuration directory.
-< if test -d $MEGAMEK_DEFAULT_CONFROOT -a \
-< -w $MEGAMEK_DEFAULT_CONFROOT; then
-< mkdir $temp_path
-< if test -d $temp_path; then
-< MEGAMEK_CONFPATH=$temp_path
-< fi
-< fi
----
-> conf=$HOME/.config/mekhq
->
-> if [[ -n "$XGD_CONFIG_HOME" ]]
-> then
-> conf="$XDG_CONFIG_HOME/mekhq"
-> fi
-80,85c68,70
-< # If MEGAMEK_CONFPATH is still not set, try the PWD.
-< if test -z "$MEGAMEK_CONFPATH"; then
-< if test -w $PWD; then
-< MEGAMEK_CONFPATH=$PWD
-< fi
-< fi
----
-> if [[ ! -d "$conf" ]]
-> then
-> mkdir -p "$conf"
-86a72,73
->
-> MEGAMEK_CONFPATH="$conf"
-90c77
-< if test -z "$MEGAMEK_CONFPATH"; then
----
-> if ! test -d "$MEGAMEK_CONFPATH"; then