From 4fca9450a782fb1c8cdee83a39e81e500913f750 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Jan 2025 15:34:05 -0500
Subject: linhes-system: lh_system_start.sh: ask systemtype before app install

add kwallet-pam and kwalletmanager to deps and change system_sudo permissions
---
 linhes/linhes-system/PKGBUILD           | 8 ++++----
 linhes/linhes-system/lh_system_start.sh | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linhes/linhes-system/PKGBUILD b/linhes/linhes-system/PKGBUILD
index b4367c7..ab0ebea 100755
--- a/linhes/linhes-system/PKGBUILD
+++ b/linhes/linhes-system/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=linhes-system
 pkgver=9.0.0
-pkgrel=84
+pkgrel=86
 arch=('x86_64')
 #install=$pkgname.install
 pkgdesc="Everything that makes LinHES a system"
 license=('GPL2')
 depends=('cronie' 'dbus-python' 'dvb-firmware' 'expect' 'flatpak' 'firefox' 'glances' 'inetutils' 
-         'kdialog' 'libnotify'
+         'kdialog' 'kwallet-pam' 'kwalletmanager' 'libnotify'
          'logrotate' 'linhes-templates' 'linhes-theme' 'mlocate' 'ncdu' 'python-dateutil' 'python-pytz'
          'python-tzlocal' 'openssh' 'pacman-contrib' 'rsyslog' 'ttf-overlock' 'wget' 'x11vnc'
          'intel-media-driver' 'libva-intel-driver' 'pigz')
@@ -33,7 +33,7 @@ sha256sums=('e6eaa2fb4819fa60cb05b4d2e7328d2914af3a73028a735ec4d56e7ece33ecc0'
             '8b54c31b8efde3917f603c5307bebb0a2a00239ad9a983c2f5d8120003256449'
             'ae34515e144830f424d3bd3f6b1b446892d62beed20bca6f0fb19b0bbb779f27'
             '9e52a21e9d0f3f993b819587256a1cd57dca04451d5f2d0fd76667b1d3f860f1'
-            '5f95bc5b1c5fd577bddbea6d5d091a837714530b05031eba189263434f48fb35'
+            'fbd1640106b3d9356452625753a6f1974e0be905b9f4732a1287b3905806cba8'
             '1c36e4fdf41c1063e0a127ce4a90fbdef19879c381a87f622d7399ca931560cc'
             '87875d9e5f5ce18208f419698ce69b6bcbcd08955a57a4a13940e715af58b787'
             '93d664f4a46fda05d0f754d19df40cbda120e325b80c07092345b14763993833'
@@ -150,7 +150,7 @@ package() {
 	install -Dm0644 $srcdir/rsyslog.hook "${pkgdir}"/usr/share/libalpm/hooks/rsyslog.hook
 
     #sudo rules
-    install -Dm0750 "$srcdir/system-sudo.rules" "$pkgdir/etc/sudoers.d/system_sudo"
+    install -Dm0440 "$srcdir/system-sudo.rules" "$pkgdir/etc/sudoers.d/system_sudo"
     chmod 750 $pkgdir/etc/sudoers.d/
 
     #udev rules
diff --git a/linhes/linhes-system/lh_system_start.sh b/linhes/linhes-system/lh_system_start.sh
index f77c465..d1bd2b9 100755
--- a/linhes/linhes-system/lh_system_start.sh
+++ b/linhes/linhes-system/lh_system_start.sh
@@ -88,16 +88,16 @@ function localweb_setup(){
 function first_configure(){
     if [ ! -f ~/.config/lh_configured ]; then
         msg "New install of LinHES. Starting setup."
-        install_lh_apps
-        nanorc_setup
-        bashrc_setup
-        x11vnc_setup
         if [ -f /etc/systemconfig ]; then
             SystemType=$(grep SystemType= /etc/systemconfig | cut -d '"' -f 2)
         else
             SystemType=$(kdialog --title "LinHES System Type" --combobox "Select the LinHES System Type:                               " "MasterBackend" "FrontendOnly" "DesktopOnly" --default "MasterBackend")
             echo "SystemType=\"$SystemType\"" | sudo tee /etc/systemconfig
         fi
+        install_lh_apps
+        nanorc_setup
+        bashrc_setup
+        x11vnc_setup
         #apply settings for specific system types
         msg "Setup as $SystemType"
         if [ $SystemType = "MasterBackend" ]; then
-- 
cgit v0.12

