jacob/hardcode-tray-git
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add doas support

Browse source
This commit is contained in:
Jacob Parnell 2023-05-11 23:20:18 -05:00
parent 7d46ba7a27
commit d68a0d42c3
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -7,3 +7,4 @@
!.SRCINFO !.SRCINFO
!90-hardcode-tray.hook !90-hardcode-tray.hook
!hook.py !hook.py
!doasuser.patch

13
PKGBUILD
View file

@ -2,8 +2,8 @@
# Contributor: Yuanji <self@gimo.me> # Contributor: Yuanji <self@gimo.me>
# Contributor: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> # Contributor: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
pkgname=hardcode-tray-git pkgname=hardcode-tray-git
pkgver=4.3.r224.ga91b4b7 pkgver=4.3.r246.g1d52b2c
pkgrel=2 pkgrel=1
pkgdesc="Fixes hardcoded tray icons" pkgdesc="Fixes hardcoded tray icons"
arch=('x86_64') arch=('x86_64')
url="https://github.com/bil-elmoussaoui/Hardcode-Tray" url="https://github.com/bil-elmoussaoui/Hardcode-Tray"
@ -17,10 +17,12 @@ provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}") conflicts=("${pkgname%-git}")
source=("${pkgname%-git}::git+https://github.com/bil-elmoussaoui/Hardcode-Tray.git" source=("${pkgname%-git}::git+https://github.com/bil-elmoussaoui/Hardcode-Tray.git"
"90-${pkgname%-git}.hook" "90-${pkgname%-git}.hook"
"hook.py") "hook.py"
"doasuser.patch")
sha256sums=('SKIP' sha256sums=('SKIP'
'c16ba6a82d4fe523cb91bf472b44296db82ff301866e3bce18bb4149d0aae5ea' 'c16ba6a82d4fe523cb91bf472b44296db82ff301866e3bce18bb4149d0aae5ea'
'64a9907f74c5c04fb9f32b2b0684a3ce040d3bc2baacabb3ca1e914d70f24c81') '64a9907f74c5c04fb9f32b2b0684a3ce040d3bc2baacabb3ca1e914d70f24c81'
'8f567656707f3e1bc534f2b30b0f87a1b9df9372be27788b61044a54fec90045')
pkgver() { pkgver() {
cd "$srcdir/${pkgname%-git}" cd "$srcdir/${pkgname%-git}"
@ -33,6 +35,9 @@ prepare() {
# Correct app.asar path for community bitwarden package # Correct app.asar path for community bitwarden package
sed -i 's|/usr/lib/bitwarden/resources/|/usr/lib/bitwarden/|g' \ sed -i 's|/usr/lib/bitwarden/resources/|/usr/lib/bitwarden/|g' \
data/database/bitwarden.electron.json data/database/bitwarden.electron.json
# Add doas support
patch --forward --strip=1 --input="${srcdir}/doasuser.patch"
} }
build() { build() {

12
doasuser.patch Normal file
View file

@ -0,0 +1,12 @@
diff --unified --recursive --text --color hardcode-tray.orig/const.py.in hardcode-tray.new/const.py.in
--- hardcode-tray.orig/const.py.in 2023-05-04 15:16:47.519709571 -0500
+++ hardcode-tray.new/const.py.in 2023-05-04 15:19:08.596711509 -0500
@@ -24,7 +24,7 @@
from HardcodeTray.tools import detect_de, get_themes
DB_FOLDER = path.join("@DATA_DIR@", "database", "")
-USERNAME = getenv("SUDO_USER") or getenv("USER")
+USERNAME = getenv("SUDO_USER") or getenv("DOAS_USER") or getenv("USER")
USERHOME = path.expanduser("~" + USERNAME)
BACKUP_FOLDER = path.join(USERHOME, ".config", "Hardcode-Tray", "")
CONFIG_FILE = path.join(USERHOME, ".config", "hardcode-tray.json")