fix errors

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b9a7be61a22..0e5622233a9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = meteor-todo-desktop
 	pkgdesc = A meter based ToDo List. used Electron-Vue
 	pkgver = 2.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://hideko.f5.si/project/meteor.html
 	arch = x86_64
 	license = MIT
@@ -12,9 +12,9 @@ pkgbase = meteor-todo-desktop
 	depends = electron22
 	depends = hicolor-icon-theme
 	conflicts = meteor-todo-desktop
-	source = meteor-todo-desktop::git+https://github.com/Hideko-Dev/Meteor.git#tag=2.0.1
+	source = meteor-todo-desktop.git::git+https://github.com/Hideko-Dev/Meteor.git#tag=2.0.1
 	source = meteor-todo-desktop.sh
 	sha256sums = SKIP
-	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = meteor-todo-desktop
diff --git a/PKGBUILD b/PKGBUILD
index f1f36629dbdf..0a81d49d299f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname="${_appname}-todo-desktop"
 _pkgname=Meteor
 pkgver=2.0.1
 _electronversion=22
-pkgrel=1
+pkgrel=2
 pkgdesc="A meter based ToDo List. used Electron-Vue"
 arch=("x86_64")
 url="https://hideko.f5.si/project/meteor.html"
@@ -22,23 +22,25 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}::git+${_ghurl}.git#tag=${pkgver}"
+    "${pkgname}.git::git+${_ghurl}.git#tag=${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|g" \
         -e "s|@appname@|${pkgname}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname}.sh"
     gendesk -q -f -n --categories "Utility" --pkgname "${_appname}-todo-desktop" --name "${_pkgname}" --exec "${pkgname} %U"
+    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}"
-    cd "${srcdir}/${pkgname}"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+    export ELECTRONVERSION="${_electronversion}"
+    export npm_config_disturl="https://electronjs.org/headers"
     sed "s|--windows --linux --mac|--linux|g" -i package.json
     npm install
     npm run postinstall
@@ -47,12 +49,12 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512 1024x1024;do
-        install -Dm644 "${srcdir}/${pkgname}/assets/png/${_icons}.png" \
+        install -Dm644 "${srcdir}/${pkgname}.git/assets/png/${_icons}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png"
     done
-    install -Dm644 "${srcdir}/${pkgname}/assets/logo.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+    install -Dm644 "${srcdir}/${pkgname}.git/assets/logo.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/meteor-todo-desktop.sh b/meteor-todo-desktop.sh
index c77c53567639..f9ced1432cfc 100644
--- a/meteor-todo-desktop.sh
+++ b/meteor-todo-desktop.sh
@@ -1,17 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "${_APPDIR}"
-    exec electron@electronversion@ "${_ASAR}" "$@"
-    exit
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    cd "${_APPDIR}"
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-    exit
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file