update to 2.4.0.beta.6.r8cede85

3 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c4b291e2792..04652b236dfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,6 @@ pkgbase = picgo-git
 	source = picgo.git::git+https://github.com/Molunerfinn/PicGo.git
 	source = picgo.sh
 	sha256sums = SKIP
-	sha256sums = e69031dd3f7af01ad71e765270e6a29f83657a021f8517a88f969044600ceafe
+	sha256sums = 668b9ab19df61e5704e49c442b179a20fc344b3d26f60680882e960a5983f2fb
 
 pkgname = picgo-git
diff --git a/PKGBUILD b/PKGBUILD
index c1cafefd55eb..5e62d53c0a94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            'e69031dd3f7af01ad71e765270e6a29f83657a021f8517a88f969044600ceafe')
+            '668b9ab19df61e5704e49c442b179a20fc344b3d26f60680882e960a5983f2fb')
 pkgver() {
     cd "${srcdir}/${pkgname//-/.}"
     printf "%s.r%s" "$(git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g;s/v//g')" "$(git rev-parse --short HEAD)"
@@ -38,8 +38,8 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/dist_electron/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-git}/resources"
-    install -Dm644 "${srcdir}/${pkgname//-/.}/dist_electron/linux-unpacked/swiftshader/"* -t "${pkgdir}/opt/${pkgname%-git}/swiftshader"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/dist_electron/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-git}"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/dist_electron/linux-unpacked/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-git}/swiftshader"
     install -Dm644 "${srcdir}/${pkgname//-/.}/build/icons/256x256.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/picgo.sh b/picgo.sh
index 979379cbf47c..f218498064c7 100644
--- a/picgo.sh
+++ b/picgo.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron17
+_ELECTRON=/usr/bin/electron16
 APPDIR="/opt/picgo"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
-export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
-_ASAR="${APPDIR}/resources/app.asar"
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else