summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 251d1103e06..aaec84e1538 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,7 @@ pkgbase = rest-client-bin
noextract = restclient-ui-fat-3.7.1.jar
source = https://github.com/wiztools/rest-client/releases/download/3.7.1/restclient-cli-fat-3.7.1.jar
source = https://github.com/wiztools/rest-client/releases/download/3.7.1/restclient-ui-fat-3.7.1.jar
- source = rest-client-icon-bd592d85340958b72776569a67a0d8ebfa4ab15b::https://github.com/wiztools/rest-client/raw/bd592d85340958b72776569a67a0d8ebfa4ab15b/restclient-ui/src/main/app-resources/rest-client_30.icns
+ source = rest-client-3.7.1-icon::https://github.com/wiztools/rest-client/raw/3.7.1/restclient-ui/src/main/app-resources/rest-client_30.icns
sha256sums = f85f2c0d516f1834745e50567f6f347b30de0531a2aca8f5476f0f973f9fe819
sha256sums = ea575df3f96841fbe6a294c04e0357a75f3541dab8d418e0f49e43a393a3daee
sha256sums = 173cfd6c315b7e85dea2d7afb8c1d6ea0c4ece3014a1a7e5b4153bef3156ad77
diff --git a/PKGBUILD b/PKGBUILD
index ad669ef89b7..17af3789f2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,14 +19,14 @@ conflicts=("${_pkgname}")
noextract=("${_pkgname/-/}-cli-fat-${pkgver}.jar"
"${_pkgname/-/}-ui-fat-${pkgver}.jar")
source=("${url}/releases/download/${pkgver}/${_pkgname/-/}-"{'cli','ui'}"-fat-${pkgver}.jar"
- "${_pkgname}-icon-${_commit_icon}::${url}/raw/${_commit_icon}/${_pkgname/-/}-ui/src/main/app-resources/${_pkgname}_30.icns")
+ "${_pkgname}-${pkgver}-icon::${url}/raw/${pkgver}/${_pkgname/-/}-ui/src/main/app-resources/${_pkgname}_30.icns")
sha256sums=('f85f2c0d516f1834745e50567f6f347b30de0531a2aca8f5476f0f973f9fe819'
'ea575df3f96841fbe6a294c04e0357a75f3541dab8d418e0f49e43a393a3daee'
'173cfd6c315b7e85dea2d7afb8c1d6ea0c4ece3014a1a7e5b4153bef3156ad77')
prepare() {
- echo -e "#!/bin/sh\ncd /usr/share/${_pkgname} && java -jar ./${_pkgname}-cli.jar" > "${_pkgname}-cli"
- echo -e "#!/bin/sh\ncd /usr/share/${_pkgname} && java -jar ./${_pkgname}-ui.jar" > "${_pkgname}-ui"
+ echo -e "#!/bin/sh\nexec java -jar /usr/share/${_pkgname}/${_pkgname}-cli.jar \"\$@\"" > "${_pkgname}-cli"
+ echo -e "#!/bin/sh\nexec java -jar /usr/share/${_pkgname}/${_pkgname}-ui.jar \"\$@\"" > "${_pkgname}-ui"
gendesk -f -n \
--pkgname="${_pkgname/-/_}" \
--pkgdesc="${pkgdesc}" \
@@ -42,9 +42,9 @@ package() {
install -Dvm755 "${_pkgname}-ui" -t "${pkgdir}/usr/bin"
install -Dvm644 "${_pkgname/-/_}.desktop" -t "${pkgdir}/usr/share/applications"
- icns2png --extract "${_pkgname}-icon-${_commit_icon}"
+ icns2png -xs 1024 -- "${_pkgname}-${pkgver}-icon"
for i in 16 22 24 32 48 64 96 128 256 512; do
- convert "${_pkgname}-icon-${_commit_icon}_512x512x32.png" -resize "${i}x${i}" "icon${i}.png"
+ convert "${_pkgname}-"*'_1024x1024x32.png' -resize "${i}x${i}" "icon${i}.png"
install -Dvm644 "icon${i}.png" "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png"
done