From 35b748c46c57e553b526ae4b106270f752b4acf3 Mon Sep 17 00:00:00 2001 From: rejbasket <39080670+rejbasket@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:59:42 +0200 Subject: Pkg inkscape check (#1622) * add warning if Inkscape not installed (mac) enable local build with arm linux and mac Authored-by: rejbasket --- bin/build-electron | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'bin/build-electron') diff --git a/bin/build-electron b/bin/build-electron index 9fdb88ae..b0e93572 100755 --- a/bin/build-electron +++ b/bin/build-electron @@ -2,11 +2,20 @@ set -e set -x +ARCH="$(uname -m)" +# Check for cpu arch to build mac and linux electron arch +if [[ "$ARCH" = "arm64" ]] || [[ "$ARCH" = "aarch64" ]]; then + echo "Found ARM" + sed -i'' -e 's/CPU_ARCH/'arm64'/' electron/package.json +else + echo "Found x64" + sed -i'' -e 's/CPU_ARCH/'x64'/' electron/package.json +fi if [ "$BUILD" = "windows" ]; then args="-w --ia32" elif [ "$BUILD" = "linux" ]; then - args="-l --x64" + args="-l" elif [ "$BUILD" = "osx" ]; then cp installer_scripts/electron-entitlements.plist electron/build/ args="-m" -- cgit v1.2.3