Moved to main

3 files changed, 56 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4843aa22a07..ecd93ca3612c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = cider
-	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.
-	pkgver = 1.6.0
-	pkgrel = 5
-	url = https://github.com/ciderapp/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 branch.
+	pkgver = 1.6.0.
+	pkgrel = 6
+	url = https://github.com/CiderApp/Cider
 	arch = armv7h
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
 	makedepends = npm
-	makedepends = pnpm
-	makedepends = python
+	makedepends = nvm
+	makedepends = fontconfig
 	makedepends = yarn
-	depends = gtk3
-	depends = nss
 	optdepends = libnotify: Playback notifications
-	source = git+https://github.com/CiderApp/Cider.git#branch=main
+	provides = cider
+	conflicts = cider
+	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..b501bc845ff7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-Cider/
+cider/
 pkg/
 src/
-*.pkg.tar.zst
\ No newline at end of file
+*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index f4c4d7fa7b23..06b5247e0d1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,75 @@
 # Maintainer: Core_UK <dev@coredev.uk>
 
 pkgname=cider
-_pkgname=Cider
-_pkgbranch=main
-pkgver=1.6.0
-pkgrel=5
+pkgver=1.6.0.
+pkgrel=6
 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' 'yarn')
+
+_repo="Cider"
+_author="CiderApp"
+_branch="main"
+
+url="https://github.com/${_author}/${_repo}"
+license=('GPL')
 optdepends=('libnotify: Playback notifications')
+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')
 
-pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    chmod +x ./resources/version.sh
-    GITHUB_REF_NAME=${_pkgbranch} ./resources/version.sh | sed 's/\-/./g'
-}
+_ensure_local_nvm() {
+  # lets be sure we are starting clean
+  which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
 
-build() {
-    cd "${srcdir}/${_pkgname}"
-    git submodule update --init --recursive
+  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 ]]
+}
 
-    echo "Building ${_pkgname} on v${pkgver} : [Install Build Dependencies] | Build | Done"
-    pnpm install
+pkgver() {
+    cd "${srcdir}/${pkgname%-git}"
+    printf "%s.r%s.%s" "$(awk -F'"' '/"version": ".+"/{ print $4; exit; }' package.json)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
-    echo "Building : Install Build Dependencies | [Build] | Done"
-    pnpm dist --linux dir
+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}"
+    git submodule update --init
+    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"
 }