4 Commits

Author SHA1 Message Date
eb8664d7e5 1.34.3 release 2025-06-18 13:32:55 -04:00
c0c25cbea3 Remove sdbus requires 2025-06-18 12:05:15 -04:00
1d41d6377f chown ~/.jriver as USER 2025-06-17 18:42:16 -04:00
a82ae73303 Add more SUSE recommends 2025-06-17 17:59:24 -04:00

View File

@@ -17,17 +17,17 @@
# * Be careful with tabs in heredocs
# * Avoid execute() for stdout
#
# We use indirection to match service names to their functions
# Allow indirection to match service names to their functions
# shellcheck disable=SC2317
shopt -s extglob
declare -g SCRIPT_VERSION="1.34.2"
declare -g MC_VERSION="34.0.36" # do find all replace
declare -g SCRIPT_VERSION="1.34.3"
declare -g MC_VERSION="34.0.36" # do find all replace (hardcoded fallback)
declare -g MC_REPO="bookworm" # should match the MC_VERSION
declare -g BOARD_ID="89.0" # MC34 board ID
declare -gi UPDATE_SWITCH=1 # set to 0 to disable automatic self-update
declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC"
# declare -g SCRIPT_URL="https://raw.githubusercontent.com/cryobry/installJRMC/refs/heads/master/installJRMC"
declare -g BOARD_ID="89.0" # MC34 board ID for automatic version detection
declare -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update
declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC" # self-update URL
# declare -g SCRIPT_URL="https://raw.githubusercontent.com/cryobry/installJRMC/refs/heads/master/installJRMC" # backup URL
declare -gi DEBUG=${DEBUG:-0} # set default debug and allow DEBUG env override (default: disabled)
# @description Print help text
@@ -193,7 +193,7 @@ parse_input() {
--vncpass) shift; VNCPASS="$1" ;;
--display) shift; USER_DISPLAY="$1" ;;
--compat) COMPAT_SWITCH=1; BUILD_SWITCH=1 ;;
--no-update) UPDATE_SWITCH=0 ;;
--no-update) SELF_UPDATE_SWITCH=0 ;;
--container|-c) shift; CONTAINERS+=("$1") ;;
--yes|-y|--auto) YES_SWITCH=1 ;;
--version|-v) echo "Version: $SCRIPT_VERSION"; exit 0 ;;
@@ -250,7 +250,7 @@ init() {
fi
# Run the self-updater if enabled
((UPDATE_SWITCH)) && update "$@"
((SELF_UPDATE_SWITCH)) && update "$@"
# Get host information
[[ -f /etc/os-release ]] && source /etc/os-release
@@ -728,7 +728,7 @@ acquire_deb() {
[[ -f $MC_DEB ]] &&
execute sudo buildah umount "$CNT" &&
execute sudo buildah rm "$CNT"; }; then
err "Failed to download DEB from containerized package manager"
err "Failed to download DEB using containerized package manager"
echo "Using legacy download method"
# Define the repository search order
local -a repos
@@ -852,8 +852,10 @@ build_rpm() {
[[ ${requires[$i]} == "mesa-vulkan-drivers" ]] && unset -v 'requires[i]'
[[ ${requires[$i]} == "libsdbus-c++1" ]] && unset -v 'requires[i]'
done
recommends+=(libvulkan1)
recommends+=(libvulkan_intel)
recommends+=(libvulkan_radeon)
recommends+=(libvulkan_nouveau)
;;
esac
@@ -1061,7 +1063,7 @@ install_mc_arch() {
arch=("$ARCH")
url="https://www.jriver.com/"
license=('custom')
depends=('alsa-lib' 'ca-certificates' 'gtk3' 'gcc-libs' 'libx11' 'libxext' 'libxcb' 'libxau' 'libxdmcp' 'util-linux' 'mesa-libgl' 'webkit2gtk' 'sdbus-cpp1')
depends=('alsa-lib' 'ca-certificates' 'gtk3' 'gcc-libs' 'libx11' 'libxext' 'libxcb' 'libxau' 'libxdmcp' 'util-linux' 'mesa-libgl' 'webkit2gtk')
optdepends=(
'mesa-libgl: nouveau video support'
'nvidia-libgl: nvidia video support'
@@ -1548,6 +1550,7 @@ disable_btrfs_cow() {
debug "${FUNCNAME[0]}()"
local mc_user_path="$HOME/.jriver"
[[ -d "$mc_user_path" ]] || execute mkdir -p "$mc_user_path"
[[ -d "$mc_user_path" ]] && execute sudo chown -R "$USER:$USER" "$mc_user_path"
# Disable btrfs CoW
if [[ $(stat -f -c %T "$mc_user_path") == "btrfs" ]]; then
@@ -1609,7 +1612,7 @@ uninstall() {
done
echo "Uninstalling the JRiver Media Center package"
if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier
if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # strip version specifier
echo "Successfully uninstalled the ${MC_PKG%%=*} package"
elif [[ $? -eq 100 ]]; then
err "JRiver Media Center package '${MC_PKG%%=*}' is not present and was not uninstalled"
@@ -1617,7 +1620,6 @@ uninstall() {
err "Could not remove Media Center package"
fi
# Remove the JRiver GPG keyfile
local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg"
if [[ -f $keyfile ]]; then
echo "Removing the JRiver Media Center GPG key"