From 7a1dba27cdfe05eae127a08914839420d5e1b547 Mon Sep 17 00:00:00 2001
From: Alfred Neumayer <dev.beidl@gmail.com>
Date: Mon, 7 Mar 2022 13:44:36 +0100
Subject: [PATCH] treewide: Fix multiarch and scaling

---
 build.sh       | 23 ++++++++++++++---------
 codium.desktop |  2 +-
 codium.wrapper |  8 ++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100755 codium.wrapper

diff --git a/build.sh b/build.sh
index d2b476e..b6ad742 100644
--- a/build.sh
+++ b/build.sh
@@ -4,23 +4,28 @@ sed -e
 
 rm *.tar.gz
 
-pkgname=vscodium
-pkgver=1.65.0
-srcdir=$ROOT/build/aarch64-linux-gnu/app
-pkgdir=$srcdir/install
-mkdir -p $srcdir $pkgdir
-
-wget https://github.com/VSCodium/vscodium/releases/download/$pkgver/VSCodium-linux-$1-$pkgver.tar.gz
-mkdir -p $srcdir/vscodium/VSCodium-linux-$1-$pkgver
-tar xvf ./VSCodium-linux-$1-$pkgver.tar.gz -C $pkgdir
+dlarch="$1"
+if [ "$1" == "amd64" ]; then
+    dlarch="x64"
+fi
 
 CLICK_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 CLICK_FRAMEWORK=ubuntu-sdk-16.04.5
 
+pkgver=1.65.0
+srcdir=$BUILD_DIR
+pkgdir=$INSTALL_DIR
+mkdir -p $srcdir $pkgdir
+
+wget https://github.com/VSCodium/vscodium/releases/download/$pkgver/VSCodium-linux-$dlarch-$pkgver.tar.gz
+tar xvf ./VSCodium-linux-$dlarch-$pkgver.tar.gz -C $pkgdir
+
 cp $ROOT/manifest.json $pkgdir/
 sed -i "s/@CLICK_ARCH@/$CLICK_ARCH/g" $pkgdir/manifest.json
 sed -i "s/@CLICK_FRAMEWORK@/$CLICK_FRAMEWORK/g" $pkgdir/manifest.json
 cp $ROOT/codium.apparmor $pkgdir/
 cp $ROOT/codium.desktop $pkgdir/
+cp $ROOT/codium.wrapper $pkgdir/
+chmod a+x $pkgdir/codium.wrapper
 
 exit 0
diff --git a/codium.desktop b/codium.desktop
index edf071d..d4f8742 100644
--- a/codium.desktop
+++ b/codium.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=VSCodium
-Exec=env GDK_BACKEND=x11 GDK_SCALE=2 ./codium --force-device-scale-factor=2 %U
+Exec=./codium.wrapper %U
 Icon=./resources/app/resources/linux/code.png
 Terminal=false
 Type=Application
diff --git a/codium.wrapper b/codium.wrapper
new file mode 100755
index 0000000..fadf89d
--- /dev/null
+++ b/codium.wrapper
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCALE=$(( $GRID_UNIT_PX / 8 ))
+
+export GDK_BACKEND=x11
+export GDK_SCALE=$SCALE
+
+exec ./codium --force-device-scale-factor=$SCALE "$@"