3 Commits

Author SHA1 Message Date
32e35bfe3a 1.35.11 release 2026-02-03 22:22:56 -05:00
d69d33d51d Use new repo key in apt container 2026-02-03 22:08:47 -05:00
d7d5af3a0b Deploy updated repo signing key 2026-02-03 20:57:13 -05:00

View File

@@ -21,7 +21,7 @@
# shellcheck disable=SC2329
shopt -s extglob
declare -g SCRIPT_VERSION="1.35.10"
declare -g SCRIPT_VERSION="1.35.11"
declare -g MC_VERSION_HARDCODE="35.0.39" # do find all replace
declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE
declare -g BOARD_ID="92.0" # MC35 board ID for fallback latest version detection
@@ -1159,7 +1159,7 @@ link_ssl_certs() {
for f in "${source_certs[@]}"; do
if [[ -f $f ]]; then
if execute sudo ln -fs "$f" "$mc_cert_link"; then
debug "Symlinked $mc_cert_link to $f"
echo "Symlinked $mc_cert_link to $f"
return 0
fi
fi
@@ -1207,6 +1207,7 @@ restore_license() {
fi
fi
done
return 1
fi
}
@@ -1792,7 +1793,8 @@ main() {
EOF
;;
debian|ubuntu)
local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg"
local keyurl="https://dist.jriver.com/mediacenter@jriver.com.gpg.complete"
local keyfile="/usr/share/keyrings/jriver-com-archive-keyring-complete.gpg"
local channel="latest"
[[ -n $BETAPASS ]] && channel="beta"
@@ -1803,7 +1805,7 @@ main() {
fi
echo "Installing JRiver Media Center GPG key"
download "https://dist.jriver.com/mediacenter@jriver.com.gpg.key" "-" |
download "$keyurl" "-" |
gpg --dearmor | sudo tee "$keyfile" &>/dev/null
echo "Installing repository file: $repo_file"
@@ -1891,6 +1893,13 @@ main() {
arch) install_mc_arch ;;
unknown) install_mc_generic ;;
esac
# shellcheck disable=SC2181
if [[ $? -eq 0 ]]; then
echo "Successfully installed JRiver Media Center"
else
err "MC package install failed!"
fi
link_ssl_certs
restore_license
@@ -1994,7 +2003,7 @@ create_mc_apt_container() {
CNT=$(buildah from --quiet alpine:edge) &&
buildah run --env MC_REPO="$repo" --env MC_ARCH="$MC_ARCH" --env CHANNEL="$channel" "$CNT" -- sh -c '
apk add --quiet --no-progress --no-cache apt curl gnupg
curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --quiet --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg
curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.complete | gpg --quiet --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg
cat <<-EOF > /etc/apt/sources.list.d/jriver.sources
Types: deb
URIs: https://dist.jriver.com/$CHANNEL/mediacenter/