diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | cabal-desktop-git.desktop (renamed from cabal-desktop.desktop) | 2 | ||||
| -rw-r--r-- | cabal-desktop-git.install (renamed from cabal-desktop.install) | 2 | ||||
| -rwxr-xr-x | cabal-desktop-git.sh | 4 | ||||
| -rwxr-xr-x | cabal-desktop.sh | 4 |
7 files changed, 36 insertions, 37 deletions
@@ -3,7 +3,7 @@ pkgbase = cabal-desktop-git pkgver = 3.1.1.r11.g23e1c10 pkgrel = 1 url = https://github.com/cabal-club/cabal-desktop - install = cabal-desktop.install + install = cabal-desktop-git.install arch = x86_64 license = AGPL3 makedepends = git @@ -13,14 +13,14 @@ pkgbase = cabal-desktop-git depends = electron provides = cabal-desktop-git conflicts = cabal-desktop-git - source = cabal-desktop::git+https://github.com/cabal-club/cabal-desktop.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5 - source = cabal-desktop.sh - source = cabal-desktop.desktop - source = cabal-desktop.install + source = cabal-desktop-git::git+https://github.com/cabal-club/cabal-desktop.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5 + source = cabal-desktop-git.sh + source = cabal-desktop-git.desktop + source = cabal-desktop-git.install md5sums = SKIP - md5sums = 8244c7f8e70a73dc0de4beb09e6d06e7 - md5sums = f0b11be2a1061cbe541c2287b3eb0926 - md5sums = a5f7c97e76cc1fda971109a050cb6a02 + md5sums = 5062bddcfedf537cc5a214f6a9bd9ced + md5sums = 22cfec2d6fbd6f6daaa0b247c46d69b9 + md5sums = c9f23c6410b51ca0d92c2ebba081b4d2 pkgname = cabal-desktop-git diff --git a/.gitignore b/.gitignore index 0a1f18b716dd..0a2726b1539b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ * -!cabal-desktop.desktop -!cabal-desktop.install -!cabal-desktop.sh +!cabal-desktop-git.desktop +!cabal-desktop-git.install +!cabal-desktop-git.sh !PKGBUILD !.SRCINFO !.gitignore @@ -1,7 +1,6 @@ # Maintainer: davedatum <ask at davedatum dot com> pkgname=cabal-desktop-git -_pkgname=cabal-desktop pkgver=3.1.1.r11.g23e1c10 pkgrel=1 pkgdesc="Desktop client for Cabal, the p2p/decentralized/local-first chat platform." @@ -12,43 +11,43 @@ depends=("electron") makedepends=("git" "npm" "libicns" "imagemagick") provides=("${pkgname}") conflicts=("${pkgname}") -install=${_pkgname}.install -source=("${_pkgname}::git+$url.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5" - "${_pkgname}.sh" - "${_pkgname}.desktop" - "${_pkgname}.install") +install=${pkgname}.install +source=("${pkgname}::git+$url.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5" + "${pkgname}.sh" + "${pkgname}.desktop" + "${pkgname}.install") md5sums=('SKIP' - '8244c7f8e70a73dc0de4beb09e6d06e7' - 'f0b11be2a1061cbe541c2287b3eb0926' - 'a5f7c97e76cc1fda971109a050cb6a02') + '5062bddcfedf537cc5a214f6a9bd9ced' + '22cfec2d6fbd6f6daaa0b247c46d69b9' + 'c9f23c6410b51ca0d92c2ebba081b4d2') prepare() { - sed -i -e '/"scripts": {/a "linux": "npm run build && electron-builder --dir",' "$srcdir/$_pkgname/package.json" - icns2png -x -s 1024 "${srcdir}/${_pkgname}/build/icon.icns" -o \ - "${srcdir}/${_pkgname}/build/" + sed -i -e '/"scripts": {/a "linux": "npm run build && electron-builder --dir",' "$srcdir/$pkgname/package.json" + icns2png -x -s 1024 "${srcdir}/${pkgname}/build/icon.icns" -o \ + "${srcdir}/${pkgname}/build/" } pkgver() { - cd "${_pkgname}" + cd "${pkgname}" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${pkgname}" npm install && npm run linux } package() { - install -Dm755 "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${_pkgname}/app.asar" - install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" - install -Dm644 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}" + install -Dm755 "${srcdir}/${pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${pkgname}/app.asar" + install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" for _size in "192x192" "128x128" "96x96" "64x64" "48x48" "32x32" "24x24" "22x22" "20x20" "16x16" "8x8" do install -dm755 "${pkgdir}/usr/share/icons/hicolor/${_size}/apps" - convert "${srcdir}/${_pkgname}/build/*.png" \ - -resize "$_size" "${pkgdir}/usr/share/icons/hicolor/${_size}/apps/${_pkgname}.png" + convert "${srcdir}/${pkgname}/build/*.png" \ + -resize "$_size" "${pkgdir}/usr/share/icons/hicolor/${_size}/apps/${pkgname}.png" done }
\ No newline at end of file diff --git a/cabal-desktop.desktop b/cabal-desktop-git.desktop index e5502e7d85f5..754b07d39301 100644 --- a/cabal-desktop.desktop +++ b/cabal-desktop-git.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Cabal Desktop Comment=Desktop client for Cabal, the p2p/decentralized/local-first chat platform. -Exec=/usr/bin/cabal-desktop +Exec=/usr/bin/cabal-desktop-git Terminal=false Type=Application Icon=cabal-desktop diff --git a/cabal-desktop.install b/cabal-desktop-git.install index eeb6462d43d4..30d11e1a675f 100644 --- a/cabal-desktop.install +++ b/cabal-desktop-git.install @@ -1,5 +1,5 @@ post_install() { - chmod +x /usr/bin/cabal-desktop + chmod +x /usr/bin/cabal-desktop-git } post_upgrade() { diff --git a/cabal-desktop-git.sh b/cabal-desktop-git.sh new file mode 100755 index 000000000000..32c2656d42fc --- /dev/null +++ b/cabal-desktop-git.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# Launch application +exec electron /opt/cabal-desktop-git/app.asar "$@"
\ No newline at end of file diff --git a/cabal-desktop.sh b/cabal-desktop.sh deleted file mode 100755 index a9f08002b986..000000000000 --- a/cabal-desktop.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Launch application -exec electron /opt/cabal-desktop/app.asar "$@"
\ No newline at end of file |