7 Commits

Author SHA1 Message Date
db8f561a61 Early arch work 2023-01-06 16:12:09 -05:00
1105a5bad1 Merge branch 'master' into dev 2023-01-06 16:10:16 -05:00
2c712d4924 v1.0-rc4 release 2023-01-06 15:18:51 -05:00
59e163c37f Silencing add-apt-repository is problematic 2023-01-06 15:17:59 -05:00
d90dad1ddf Release 1.0-rc3 2023-01-03 12:01:41 -05:00
149107f054 ID raspbian as debian 2023-01-03 12:00:38 -05:00
eee5a37ab2 Use case for ID checks 2023-01-03 10:21:27 -05:00

View File

@@ -16,12 +16,12 @@
shopt -s extglob shopt -s extglob
declare -g SCRIPTVERSION="1.0-rc2" declare -g SCRIPTVERSION="1.0-rc4"
declare -g OUTPUTDIR="$PWD/output" declare -g OUTPUTDIR="$PWD/output"
declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC30 (Buster) declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,76.0.html" # MC30 (Buster)
declare -g DEBIANBASE="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 CREATEREPO_WEBROOT="/var/www/jriver"
declare -g USER="${SUDO_USER:-$USER}" declare -g USER="${SUDO_USER:-$USER}"
@@ -273,6 +273,9 @@ init() {
*suse*) *suse*)
ID="suse" ID="suse"
;; ;;
raspbian)
ID="debian"
;;
*) *)
echo "Autodetecting distro, this may be unreliable and --compat may also be required" echo "Autodetecting distro, this may be unreliable and --compat may also be required"
if hash dnf &>/dev/null; then if hash dnf &>/dev/null; then
@@ -379,8 +382,14 @@ setMCVersion() {
if [[ "$MCVERSION_SOURCE" == "user input" ]]; then if [[ "$MCVERSION_SOURCE" == "user input" ]]; then
# Append explicit package version when user provides --mcversion # Append explicit package version when user provides --mcversion
[[ "$ID" =~ ^(fedora|centos|suse)$ ]] && MCPKG+="-$MCVERSION" case "$ID" in
[[ "$ID" =~ ^(debian|ubuntu)$ ]] && MCPKG+="=$MCVERSION" fedora|centos|suse)
MCPKG+="-$MCVERSION"
;;
debian|ubuntu)
MCPKG+="=$MCVERSION"
;;
esac
fi fi
echo "Using MC version $MCVERSION determined by $MCVERSION_SOURCE." echo "Using MC version $MCVERSION determined by $MCVERSION_SOURCE."
[[ "$MCVERSION_SOURCE" == "user input" ]] || echo "To override, use --mcversion." [[ "$MCVERSION_SOURCE" == "user input" ]] || echo "To override, use --mcversion."
@@ -827,6 +836,42 @@ installMesa() {
installMCARCH() { installMCARCH() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
echo "Arch install under construction" echo "Arch install under construction"
[[ ! -d "$OUTPUTDIR/PKGBUILD/" ]] && mkdir -p "$OUTPUTDIR/mediacenter.pkgbuild"
cat <<-EOF > "$OUTPUTDIR/PKGBUILD/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
pushd "$OUTPUTDIR/PKGBUILD" || return
makepkg \
--syncdeps \
--clean \
--cleanbuild \
--force \
--install \
-p "mediacenter.pkgbuild"
popd "$OUTPUTDIR/PKGBUILD" || return
} }
@@ -1631,7 +1676,7 @@ main() {
if ! grep ^deb /etc/apt/sources.list|grep -q universe; then if ! grep ^deb /etc/apt/sources.list|grep -q universe; then
echo "Adding universe repository" echo "Adding universe repository"
declare add_universe_cmd="sudo add-apt-repository -y universe" 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 if ! exec "$add_universe_cmd"; then
err "Adding universe repository failed" err "Adding universe repository failed"
fi fi