Cleanup explicit MC_PKG naming
This commit is contained in:
@@ -434,6 +434,7 @@ init() {
|
|||||||
MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm"
|
MC_RPM="$OUTPUT_DIR/RPMS/$ARCH/mediacenter$MC_MVERSION-$MC_VERSION-$MC_RELEASE.$ARCH.rpm"
|
||||||
MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"
|
MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"
|
||||||
|
|
||||||
|
# Use explicit architecture for Debian-based distros to avoid package manager confusion with multiarch
|
||||||
if [[ $ID == debian || $ID == raspbian || $ID == ubuntu ]]; then
|
if [[ $ID == debian || $ID == raspbian || $ID == ubuntu ]]; then
|
||||||
MC_PKG+=":$MC_ARCH"
|
MC_PKG+=":$MC_ARCH"
|
||||||
fi
|
fi
|
||||||
@@ -443,9 +444,8 @@ init() {
|
|||||||
# Append explicit package version when user provides --mcversion
|
# Append explicit package version when user provides --mcversion
|
||||||
case $ID in
|
case $ID in
|
||||||
fedora|centos|suse|mandriva) MC_PKG+="-$MC_VERSION" ;;
|
fedora|centos|suse|mandriva) MC_PKG+="-$MC_VERSION" ;;
|
||||||
debian|raspbian|ubuntu)
|
debian|raspbian|ubuntu) MC_PKG+="=${MC_VERSION}"
|
||||||
# Debian-family packages keep the requested architecture in the name.
|
# MC ARM packages append the architecture to the package name
|
||||||
MC_PKG+="=${MC_VERSION}"
|
|
||||||
[[ $MC_ARCH == "arm64" || $MC_ARCH == "armhf" ]] && MC_PKG+="-${MC_ARCH}"
|
[[ $MC_ARCH == "arm64" || $MC_ARCH == "armhf" ]] && MC_PKG+="-${MC_ARCH}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user