Add support for flags in ~/.config/codium-flags.conf

6 files changed, 55 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdf49aa8d8b2..d13f576548e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = vscodium-bin
 	pkgdesc = Binary releases of VS Code without MS branding/telemetry/licensing.
 	pkgver = 1.76.1.23069
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/VSCodium/vscodium
+	install = vscodium-bin.install
 	arch = x86_64
 	arch = aarch64
 	license = MIT
@@ -17,6 +18,7 @@ pkgbase = vscodium-bin
 	depends = libnotify
 	depends = libxss
 	depends = glibc>=2.28-4
+	depends = bash
 	optdepends = gvfs: For move to trash functionality
 	optdepends = libdbusmenu-glib: For KDE global menu
 	provides = vscode
@@ -25,8 +27,12 @@ pkgbase = vscodium-bin
 	conflicts = vscodium
 	source = vscodium-bin.desktop
 	source = vscodium-bin-uri-handler.desktop
-	sha256sums = a665ef6e2a1711df2552d7ae49fd7f30f7a2d7e0dea71c7c5f4c90764d8c37ce
-	sha256sums = fd6b46c021e4f0b75d27fcf67481019dbbaa7059ea186437a47a6b6ae8bb574f
+	source = vscodium-bin.install
+	source = vscodium-bin.sh
+	sha256sums = eb5a62f83c034d10e2806b33003bfe4d27fdc28c663eb0b4c8a5e29faa14a7c7
+	sha256sums = 6eef345b65bf2679c928c763529540435ab9c6e1836917319810a7a2d484ae1b
+	sha256sums = f746113e779ab0f5a21a7a2326ec43b0dc76b15cc38d06439f478326eb6609be
+	sha256sums = 87f687c1dfa66f390c63ac2717ba754e5b9babefb09e417312e089440eb15ab4
 	source_x86_64 = https://github.com/VSCodium/vscodium/releases/download/1.76.1.23069/VSCodium-linux-x64-1.76.1.23069.tar.gz
 	sha256sums_x86_64 = d3240c42150333bf912048509f5c404434a72dadc4295d86041cb9636cb87c60
 	source_aarch64 = https://github.com/VSCodium/vscodium/releases/download/1.76.1.23069/VSCodium-linux-arm64-1.76.1.23069.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index be65831320e0..79c017f4dd56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,14 @@
 pkgname=vscodium-bin
 _pkgname=VSCodium
 pkgver=1.76.1.23069
-pkgrel=1
+pkgrel=2
 pkgdesc="Binary releases of VS Code without MS branding/telemetry/licensing."
 arch=('x86_64' 'aarch64')
 url="https://github.com/VSCodium/vscodium"
 license=('MIT')
 depends=(
         fontconfig libxtst gtk3 python cairo alsa-lib nss gcc-libs libnotify libxss
-        'glibc>=2.28-4'
+        'glibc>=2.28-4' bash
         )
 optdepends=(
         'gvfs: For move to trash functionality'
@@ -23,13 +23,18 @@ optdepends=(
 )
 provides=('vscode' 'codium' 'vscodium')
 conflicts=('vscodium')
+install=$pkgname.install
 
-sha256sums=('a665ef6e2a1711df2552d7ae49fd7f30f7a2d7e0dea71c7c5f4c90764d8c37ce'
-            'fd6b46c021e4f0b75d27fcf67481019dbbaa7059ea186437a47a6b6ae8bb574f')
+sha256sums=('eb5a62f83c034d10e2806b33003bfe4d27fdc28c663eb0b4c8a5e29faa14a7c7'
+            '6eef345b65bf2679c928c763529540435ab9c6e1836917319810a7a2d484ae1b'
+            'f746113e779ab0f5a21a7a2326ec43b0dc76b15cc38d06439f478326eb6609be'
+            '87f687c1dfa66f390c63ac2717ba754e5b9babefb09e417312e089440eb15ab4')
 sha256sums_x86_64=('d3240c42150333bf912048509f5c404434a72dadc4295d86041cb9636cb87c60')
 sha256sums_aarch64=('0776b12520e5e52015f5952851c2280a532069adfb72ab6dfccd7c63cb75ff0d')
 source=('vscodium-bin.desktop'
-        'vscodium-bin-uri-handler.desktop')
+        'vscodium-bin-uri-handler.desktop'
+        'vscodium-bin.install'
+        'vscodium-bin.sh')
 source_x86_64=("https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${_pkgname}-linux-x64-${pkgver}.tar.gz")
 source_aarch64=("https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${_pkgname}-linux-arm64-${pkgver}.tar.gz")
 
@@ -46,6 +51,7 @@ package() {
   install -D -m644 ${srcdir}/vscodium-bin-uri-handler.desktop ${pkgdir}/usr/share/applications/codium-uri-handler.desktop
   install -D -m644 ${srcdir}/resources/app/resources/linux/code.png \
           ${pkgdir}/usr/share/pixmaps/vscodium.png
+  install -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/codium"
 
   # Symlink shell completions
   install -d -m755 ${pkgdir}/usr/share/zsh/site-functions
diff --git a/vscodium-bin-uri-handler.desktop b/vscodium-bin-uri-handler.desktop
index 4f3f09e5fa44..80711ba94ff2 100644
--- a/vscodium-bin-uri-handler.desktop
+++ b/vscodium-bin-uri-handler.desktop
@@ -2,7 +2,7 @@
 Name=VSCodium - URL Handler
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=/opt/vscodium-bin/bin/codium --open-url %U
+Exec=/usr/bin/codium --open-url %U
 Icon=vscodium
 Type=Application
 NoDisplay=true
diff --git a/vscodium-bin.desktop b/vscodium-bin.desktop
index be323c1d3fa8..e752d96ecbba 100644
--- a/vscodium-bin.desktop
+++ b/vscodium-bin.desktop
@@ -2,7 +2,7 @@
 Name=VSCodium
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=/opt/vscodium-bin/bin/codium --no-sandbox --unity-launch %F
+Exec=/usr/bin/codium --no-sandbox --unity-launch %F
 Icon=vscodium
 Type=Application
 StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window
-Exec=/opt/vscodium-bin/bin/codium --no-sandbox --new-window %F
+Exec=/usr/bin/codium --no-sandbox --new-window %F
 Icon=vscodium
diff --git a/vscodium-bin.install b/vscodium-bin.install
new file mode 100644
index 000000000000..b03a8e237b41
--- /dev/null
+++ b/vscodium-bin.install
@@ -0,0 +1,21 @@
+# Colored makepkg-like functions
+msg_blue() {
+    printf "${blue}==>${bold} $1${all_off}\n"
+}
+
+note() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
+
+post_install() {
+    note "Custom flags should be put directly in: ~/.config/codium-flags.conf"
+}
+
+post_upgrade() {
+    post_install
+}
diff --git a/vscodium-bin.sh b/vscodium-bin.sh
new file mode 100644
index 000000000000..343ca1aa69c1
--- /dev/null
+++ b/vscodium-bin.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config}
+
+# Allow users to override command-line options
+if [[ -f $XDG_CONFIG_HOME/codium-flags.conf ]]; then
+   CODE_USER_FLAGS="$(cat $XDG_CONFIG_HOME/codium-flags.conf)"
+fi
+
+# Launch
+exec /opt/vscodium-bin/bin/codium $CODE_USER_FLAGS "$@"