Fixed pkg-local

nikarh · Jan 8, 2024 · 308eafa · 308eafa
1 parent 0e520da
commit 308eafa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/system/hooks/pacman/pre.sh b/system/hooks/pacman/pre.sh
@@ -23,7 +23,7 @@ function pkg {
 
 function pkg-local {
     local package="$(cat "$1/PKGBUILD" | grep ^pkgname | awk -F'=' '{print $2}')"
-    local current_version="$(cat "$1/PKGBUILD" | grep '^\(pkgver\|pkgrel\)' | tr -d '\n' | sed -r 's/pkgver=(.*)pkgrel=(.*)/\1-\2/')"
+    local current_version="$(cat "$1/PKGBUILD" | grep '^\(pkgver=\|pkgrel=\)' | tr -d '\n' | sed -r 's/pkgver=(.*)pkgrel=(.*)/\1-\2/')"
     local installed=$(pacman -Q "$package" 2> /dev/null)
     local installed_version=$(echo $installed | awk '{ print $2 }')
 
@@ -33,7 +33,7 @@ function pkg-local {
 
             (
                 cd "$1"
-                makepkg --noconfirm
+                makepkg --noconfirm -f
             )
         fi
         sudo pacman -U --noconfirm "$1/$built_file"

diff --git a/system/modules/common/gaming/root/etc/sudoers.d/games b/system/modules/common/gaming/root/etc/sudoers.d/games
@@ -1,5 +1,5 @@
 User_Alias GAMES_USERS = %games
-Cmnd_Alias PLAY= /usr/bin/play.sh,/usr/bin/briectl,/usr/bin/brie,/usr/bin/winecfg
+Cmnd_Alias PLAY = /usr/bin/briectl,/usr/bin/brie,/usr/bin/winecfg
 
 Defaults:GAMES_USERS env_reset
 Defaults:GAMES_USERS env_keep += DISPLAY

diff --git a/user/workstation/user/home/.config/Code/User/settings.json b/user/workstation/user/home/.config/Code/User/settings.json
@@ -92,6 +92,7 @@
         "blueprintjs",
         "bools",
         "Borderless",
+        "briectl",
         "bson",
         "bytemuck",
         "bytesize",
@@ -197,6 +198,7 @@
         "nvngx",
         "nvoptix",
         "onoff",
+        "openapi",
         "optlen",
         "optres",
         "outerwilds",
@@ -369,4 +371,7 @@
     "[sql]": {
         "editor.defaultFormatter": "mtxr.sqltools"
     },
+    "[svg]": {
+        "editor.defaultFormatter": "jock.svg"
+    },
 }