From 149107f054434b24fac60004e39ec0a063be0762 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 3 Jan 2023 12:00:38 -0500 Subject: [PATCH 1/4] ID raspbian as debian --- installJRMC | 3 +++ 1 file changed, 3 insertions(+) diff --git a/installJRMC b/installJRMC index ec33fea..73efaca 100755 --- a/installJRMC +++ b/installJRMC @@ -274,6 +274,9 @@ init() { *suse*) ID="suse" ;; + raspbian) + ID="debian" + ;; *) echo "Autodetecting distro, this may be unreliable and --compat may also be required" if hash dnf &>/dev/null; then From d90dad1ddfa59d6f3a4c3cfd1826a46a1ca689d5 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 3 Jan 2023 12:01:41 -0500 Subject: [PATCH 2/4] Release 1.0-rc3 --- installJRMC | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installJRMC b/installJRMC index 73efaca..d11d1d2 100755 --- a/installJRMC +++ b/installJRMC @@ -16,12 +16,12 @@ shopt -s extglob -declare -g SCRIPTVERSION="1.0-rc2" +declare -g SCRIPTVERSION="1.0-rc3" declare -g OUTPUTDIR="$PWD/output" declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC30 (Buster) declare -g DEBIANBASE="buster" -declare -g MCVERSION_HARDCODE="30.0.44" # Hardcoded fallback +declare -g MCVERSION_HARDCODE="30.0.45" # Hardcoded fallback declare -g CREATEREPO_WEBROOT="/var/www/jriver" declare -g USER="${SUDO_USER:-$USER}" From 59e163c37fc686dca817c1b0220bb6818a25746d Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 6 Jan 2023 15:17:59 -0500 Subject: [PATCH 3/4] Silencing add-apt-repository is problematic --- installJRMC | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/installJRMC b/installJRMC index d11d1d2..bcb365c 100755 --- a/installJRMC +++ b/installJRMC @@ -831,6 +831,32 @@ installMesa() { installMCARCH() { debug "Running: ${FUNCNAME[0]}" echo "Arch install under construction" + [[ ! -d "$OUTPUTDIR/PKGBUILD/" ]] && mkdir -p "$OUTPUTDIR/PKGBUILD" + cat <<-EOF > "$OUTPUTDIR/PKGBUILD/mediacenter.pkgbuild" + pkgname=mediacenter$MVERSION + pkgver=$MCVERSION + pkgrel=1 + pkgdesc="The Most Comprehensive Media Software" + arch=('x86_64') + url="http://www.jriver.com/" + license=('custom') + depends=('alsa-lib' 'gcc-libs' 'libx11' 'libxext' 'libxcb' 'libxau' 'libxdmcp' 'util-linux' 'libxext' 'gtk3') + optdepends=('mesa-libgl: nouveau video support' + 'nvidia-libgl: nvidia video support' + 'nvidia-utils: nvidia vulkan support' + 'vulkan-intel: intel vulkan support' + 'vulkan-radeon: amd vulkan support' + 'vorbis-tools: ogg vorbis support' + 'musepack-tools: musepack support' + ) + source=("http://files.jriver.com/mediacenter/channels/v30/latest/MediaCenter-$MCVERSION-amd64.deb" 'License.txt') + + package() { + cd "\$srcdir" + bsdtar xf data.tar.xz -C "\$pkgdir" + install -Dm644 "License.txt" "\$pkgdir/usr/share/licenses/\$pkgname/COPYING" + } + EOF } @@ -1635,7 +1661,7 @@ main() { if ! grep ^deb /etc/apt/sources.list|grep -q universe; then echo "Adding universe repository" declare add_universe_cmd="sudo add-apt-repository -y universe" - debug "$add_universe_cmd" || add_universe_cmd+=" &>/dev/null" + #debug "$add_universe_cmd" || add_universe_cmd+=" &>/dev/null" if ! exec "$add_universe_cmd"; then err "Adding universe repository failed" fi From 2c712d4924fcc290866a33621350f087cada717f Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 6 Jan 2023 15:18:51 -0500 Subject: [PATCH 4/4] v1.0-rc4 release --- installJRMC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installJRMC b/installJRMC index bcb365c..36677b0 100755 --- a/installJRMC +++ b/installJRMC @@ -16,7 +16,7 @@ shopt -s extglob -declare -g SCRIPTVERSION="1.0-rc3" +declare -g SCRIPTVERSION="1.0-rc4" declare -g OUTPUTDIR="$PWD/output" declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC30 (Buster)