diff options
author | Core | 2023-01-31 18:19:33 +0000 |
---|---|---|
committer | Core | 2023-01-31 18:19:33 +0000 |
commit | c52745419b6159becd2294ba40178be2ad6dc558 (patch) | |
tree | 069b8dec8b0d77dce843cf54e5053fb7721d0114 | |
parent | 57d569d8b8fe8883f0da8bdccdb9de55db73f14a (diff) | |
download | aur-c52745419b6159becd2294ba40178be2ad6dc558.tar.gz |
Overhauled PKGBUILD to follow updated build flow
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 72 |
3 files changed, 50 insertions, 40 deletions
@@ -1,22 +1,20 @@ pkgbase = cider-git - pkgdesc = Project Cider. An open-source Apple Music client built from the ground up with Vue.js and Electron. Compiled from the GitHub repositories main branch. + pkgdesc = Project Cider. An open-source Apple Music client built from the ground up with Vue.js and Electron. Compiled from the GitHub repositories branch. pkgver = 1.6.0 - pkgrel = 6 - url = https://github.com/ciderapp/Cider.git + pkgrel = 7 + url = https://github.com/CiderApp/Cider arch = armv7h arch = i686 arch = x86_64 license = GPL - makedepends = git makedepends = npm - makedepends = pnpm - makedepends = python - depends = gtk3 - depends = nss + makedepends = nvm + makedepends = fontconfig + makedepends = yarn optdepends = libnotify: Playback notifications provides = cider conflicts = cider - source = git+https://github.com/CiderApp/Cider.git#branch=main + source = cider::git+https://github.com/CiderApp/Cider.git#branch=main source = cider.desktop sha256sums = SKIP sha256sums = c41e9b1019411019fce8509e32f770edf33c9e864bf707c30ffe2e3f2dcf1571 diff --git a/.gitignore b/.gitignore index 780c104bfbc2..7d2f04e9eb82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -Cider/ +cider/ pkg/ src/ *.pkg.tar.zst
\ No newline at end of file @@ -1,63 +1,75 @@ # Maintainer: Core_UK <dev@coredev.uk> pkgname=cider-git -_pkgname=Cider -_pkgbranch=main pkgver=1.6.0 -pkgrel=6 +pkgrel=7 pkgdesc="Project Cider. An open-source Apple Music client built from the ground up with Vue.js and Electron. Compiled from the GitHub repositories ${_pkgbranch} branch." arch=("armv7h" "i686" "x86_64") -url="https://github.com/ciderapp/${_pkgname}.git" -license=("GPL") -depends=('gtk3' 'nss') -makedepends=('git' 'npm' 'pnpm' 'python') + +_repo="Cider" +_author="CiderApp" +_branch="main" + +url="https://github.com/${_author}/${_repo}" +license=('GPL') optdepends=('libnotify: Playback notifications') -provides=('cider') -conflicts=('cider') +makedepends=('npm' 'nvm' 'fontconfig' 'yarn') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") source=( - "git+https://github.com/CiderApp/${_pkgname}.git#branch=${_pkgbranch}" - "cider.desktop" + "${pkgname%-git}::git+https://github.com/${_author}/${_repo}.git#branch=${_branch}" + "${pkgname%-git}.desktop" ) sha256sums=('SKIP' - 'c41e9b1019411019fce8509e32f770edf33c9e864bf707c30ffe2e3f2dcf1571') + 'c41e9b1019411019fce8509e32f770edf33c9e864bf707c30ffe2e3f2dcf1571') + +_ensure_local_nvm() { + # lets be sure we are starting clean + which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload + + export NVM_DIR="${srcdir}/${pkgname}-core-${pkgver}/.nvm" + # The init script returns 3 if version + # specified in ./.nvrc is not (yet) installed in $NVM_DIR + # but nvm itself still gets loaded ok + source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] +} pkgver() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${pkgname%-git}" chmod +x ./resources/version.sh GITHUB_REF_NAME=${_pkgbranch} ./resources/version.sh | sed 's/\-/./g' } -build() { - cd "${srcdir}/${_pkgname}" - git submodule update --init --recursive - - echo "store-dir=.pnpm-store" >> .npmrc - - echo "Building ${_pkgname} on v${pkgver} : [Install Build Dependencies] | Build | Done" - pnpm install --frozen-lockfile - - echo "Building : Install Build Dependencies | [Build] | Done" - pnpm dist:linuxdir +prepare() { + _ensure_local_nvm + cd "${srcdir}/${pkgname%-git}" + nvm install +} - echo "Building : Install Build Dependencies | Build | [Done]" +build() { + _ensure_local_nvm + cd "${srcdir}/${pkgname%-git}" + npm run bootstrap + npm run dist } package() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}/${pkgname%-git}" # Desktop File install -Dm644 "${srcdir}/${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop" # Install the icon - install -Dm644 "${srcdir}/${_pkgname}/resources/icons/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname%-git}.png" + install -Dm644 "${srcdir}/${pkgname%-git}/resources/icons/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname%-git}.png" # Install the build files install -d "$pkgdir/opt/" install -d "$pkgdir/usr/bin/" - cd ${srcdir}/${_pkgname}/dist/linux-unpacked + + cd ${srcdir}/${pkgname%-git}/dist/linux-unpacked/ mkdir "${pkgdir}/opt/${pkgname%-git}" cp -r --preserve=mode * "${pkgdir}/opt/${pkgname%-git}" ln -sf "/opt/${pkgname%-git}/${pkgname%-git}" "${pkgdir}/usr/bin/${pkgname%-git}" + # License and Readme install -d "$pkgdir/usr/share/licenses" "$pkgdir/usr/share/doc" - install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "${srcdir}/${_pkgname}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md" + install -Dm644 "${srcdir}/${pkgname%-git}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md" } |