diff options
| -rwxr-xr-x | linhes/linhes-system/PKGBUILD | 4 | ||||
| -rwxr-xr-x | linhes/linhes-system/lh_system_start.sh | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/linhes/linhes-system/PKGBUILD b/linhes/linhes-system/PKGBUILD index 8c5d6fd..f336947 100755 --- a/linhes/linhes-system/PKGBUILD +++ b/linhes/linhes-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-system pkgver=9.0.0 -pkgrel=27 +pkgrel=28 arch=('x86_64') #install=$pkgname.install pkgdesc="Everything that makes LinHES a system" @@ -29,7 +29,7 @@ sha256sums=('7f91d2afcb76e8e9063c6bbe05f5c3d134a6f67541aead8894d342c32d34ad98' '11168c9cd3b117decaab6bc665c183b4aab917cf0a976bce4c1b5e4686a27bc9' 'ae34515e144830f424d3bd3f6b1b446892d62beed20bca6f0fb19b0bbb779f27' '23358a7bff4968eccd469613b81b1415c2ae0ebe77f14f74426697333e4d88d7' - '393fbc46acc839e0a1ba69e968fed8bdea078d061235289d7ef1b30fece14047' + '7c6485d07ca67d2a4f089ed885c8ae3a9205d6f43f373ae8a32c2da55daa6de8' '6d4fb0ed1a5ed961b3a3884dce093118e50c2981a9cd5837d20abc5a6d4fd8aa' '87875d9e5f5ce18208f419698ce69b6bcbcd08955a57a4a13940e715af58b787' '91bdec992bb2c933e15625c181f2195c402060b879168ebf35944cb064c904b9' diff --git a/linhes/linhes-system/lh_system_start.sh b/linhes/linhes-system/lh_system_start.sh index b6133ee..d5a7646 100755 --- a/linhes/linhes-system/lh_system_start.sh +++ b/linhes/linhes-system/lh_system_start.sh @@ -6,7 +6,7 @@ HOSTNAME=`/usr/bin/hostnamectl hostname` function msg(){ - /usr/bin/lh_notify-send --app-name="LinHES" --icon=dialog-information "$1" "$2" "$3" + /usr/bin/lh_notify-send --app-name="LinHES" --icon=dialog-information "$1" "$2" } function check_installer_user(){ @@ -64,9 +64,9 @@ function storage_scan(){ function install_lh_apps(){ #install programs that are not needed on the iso - msg "--expire-time=30000" "Installing apps. This could take a few minutes." + /usr/bin/lh_notify-send --app-name="LinHES" --icon=dialog-information --expire-time=40000 "Installing apps." "This could take a few minutes." sudo pacman -Syyy --noconfirm archlinux-keyring - sudo pacman -Syyy --noconfirm flatpak firefox glances mythtv mythplugins-mytharchive mythplugins-mythmusic mythplugins-mythweb ncdu x11vnc + sudo pacman -Syyy --noconfirm flatpak firefox glances mlocate mythtv mythplugins-mytharchive mythplugins-mythmusic mythplugins-mythweb ncdu x11vnc status=$? [ $status -eq 1 ] && msg "Could not install apps. Check internet connection. Cancelling Setup." && exit 1 flatpak install tv.plex.PlexHTPC --noninteractive --assumeyes @@ -100,8 +100,12 @@ function first_configure(){ nanorc_setup bashrc_setup x11vnc_setup - SystemType=$(kdialog --title "LinHES System Type" --combobox "Select the LinHES System Type: " "MasterBackend" "FrontendOnly" --default "MasterBackend") - + 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" --default "MasterBackend") + echo "SystemType=\"$SystemType\"" | sudo tee /etc/systemconfig + fi #apply settings for specific system types msg "Setup as $SystemType" if [ ! $SystemType = "FrontendOnly" ]; then @@ -127,7 +131,7 @@ function first_configure(){ } function start_myth() { - STARTCMD="/usr/bin/mythfrontend" + STARTCMD="/usr/bin/mythfrontend --systemd-journal" $STARTCMD 2>&1 & } |