fix errors

3 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf75a0a98b89..40dfafdbb93f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = figma-linux-git
 	pkgdesc = The collaborative interface design tool. Unofficial Figma desktop client for Linux
-	pkgver = 0.11.3.r1.g4ff0fea
+	pkgver = 0.11.3.r2.g313c270
 	pkgrel = 1
 	url = https://github.com/Figma-Linux/figma-linux
 	arch = any
@@ -13,11 +13,12 @@ pkgbase = figma-linux-git
 	depends = hicolor-icon-theme
 	depends = libdbusmenu-gtk3
 	depends = libdbusmenu-glib
+	depends = xdg-utils
 	provides = figma-linux
 	conflicts = figma-linux
 	source = figma-linux.git::git+https://github.com/Figma-Linux/figma-linux.git
 	source = figma-linux.sh
 	sha256sums = SKIP
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = figma-linux-git
diff --git a/PKGBUILD b/PKGBUILD
index eb68e2408c0e..9715ffc09bf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: iFlygo
 pkgname=figma-linux-git
 _pkgname=Figma-linux
-pkgver=0.11.3.r1.g4ff0fea
+pkgver=0.11.3.r2.g313c270
 _electronversion=27
 _nodeversion=18
 pkgrel=1
@@ -17,6 +17,7 @@ depends=(
     'hicolor-icon-theme'
     'libdbusmenu-gtk3'
     'libdbusmenu-glib'
+    'xdg-utils'
 )
 makedepends=(
     'gendesk'
@@ -29,7 +30,7 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 pkgver() {
     cd "${srcdir}/${pkgname%-git}.git"
     git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -45,6 +46,7 @@ build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-git}.sh"
     _ensure_local_nvm
     gendesk -f -n -q --categories="Utility" --name="${_pkgname}" --exec="${pkgname} %U"
@@ -57,7 +59,14 @@ build() {
     export ELECTRONVERSION="${_electronversion}"
     export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
-    sed "s|--config=config/builder.json -l|--config=config/builder.json -l AppImage|g" -i package.json
+    if [ `curl ifconfig.co/country` = "China" ];then
+        echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
+        echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc
+        echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+    else
+        echo "Your network is OK."
+    fi
+    sed "s|--config=config/builder.json -l|--config=config/builder.json --dir|g" -i package.json
     sed 's|"output": "build/installers"|"output": "build"|g' -i config/builder.json
     npm install --no-frozen-lockfile
     npm run package
@@ -71,9 +80,9 @@ package() {
     install -Dm644 "${srcdir}/${pkgname%-git}.git/build/linux-"*/usr/lib/*/nss/* -t "${pkgdir}/usr/lib/${pkgname%-git}/lib"
     install -Dm644 "${srcdir}/${pkgname%-git}.git/build/linux-"*/swiftshader/* -t "${pkgdir}/usr/lib/${pkgname%-git}/swiftshader"
     install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
-    for _icons in 24x24 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 384x384 512x512;do
-        install -Dm644 "${srcdir}/${pkgname%-git}.git/lib/icons/${_icons}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-git}.png"
+    for _icons in 24x24 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 384x384 512x512 scalable;do
+        install -Dm644 "${srcdir}/${pkgname%-git}.git/lib/icons/${_icons}."* \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-git}."*
     done
     install -Dm644 "${srcdir}/${pkgname%-git}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/figma-linux.sh b/figma-linux.sh
index f9ced1432cfc..7ddcaab8d734 100644
--- a/figma-linux.sh
+++ b/figma-linux.sh
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file