fix errors

2 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 972f73b6fcdc..837d3b94e1a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = issie
 	pkgdesc = An intuitive cross-platform hardware design application.
 	pkgver = 4.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://tomcl.github.io/issie
 	arch = any
 	license = GPL3
@@ -30,7 +30,7 @@ pkgbase = issie
 	depends = alsa-lib
 	depends = gtk3
 	conflicts = issie
-	source = issie-4.1.0::git+https://github.com/tomcl/issie.git#tag=v4.1.0
+	source = issie.git::git+https://github.com/tomcl/issie.git#tag=v4.1.0
 	sha256sums = SKIP
 
 pkgname = issie
diff --git a/PKGBUILD b/PKGBUILD
index d823fca3fa1c..4b2a57391a3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@
 pkgname=issie
 pkgver=4.1.0
 _electronversion=24
-pkgrel=3
+_nodeversion=18
+pkgrel=4
 pkgdesc="An intuitive cross-platform hardware design application."
 arch=('any')
 url="https://tomcl.github.io/issie"
@@ -39,33 +40,33 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${_ghurl}.git#tag=v${pkgver}"
+    "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}"
 )
 sha256sums=('SKIP')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
-    nvm install 18
-    nvm use 18
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
 }
 build() {
     _ensure_local_nvm
     gendesk -q -f -n --categories "Development" --name "${pkgname}" --exec "${pkgname} --no-sandbox %U"
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}.git"
     export npm_config_build_from_source=true
     export npm_config_cache="${srcdir}/.npm_cache"
-    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
-    export ELECTRONVERSION="${_electronversion}"
+    #export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    #export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    #export ELECTRONVERSION="${_electronversion}"
     dotnet tool restore
     dotnet paket install
-    npm ci
-    npm run dist
+    npm install
+    npm run pack
 }
 package() {
     install -Dm755 -d "${pkgdir}/"{opt/"${pkgname}",usr/bin}
-    cp -r "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/"* "${pkgdir}/opt/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/dist/linux-"*/* "${pkgdir}/opt/${pkgname}"
     ln -sf "/opt/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}.git/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file