Add beta version support, show rpmbuild errors, fix security limits configuration naming

This commit is contained in:
2019-03-20 11:36:58 -04:00
parent 6f8f125a19
commit 0119faa12d

View File

@@ -41,7 +41,7 @@ fi
#if ! rpm --quiet --query rpmfusion-nonfree-release; then
# echo "${bold}Installing rpmfusion-nonfree-release repo...${normal}"
# sudo ${PM} -y --nogpgcheck install https://download1.rpmfusion.org/nonfree/${ID}/#rpmfusion-nonfree-release-${VERSION_ID}.noarch.rpm
# sudo ${PM} -y --nogpgcheck install https://download1.rpmfusion.org/nonfree/${ID}/rpmfusion-nonfree-release-${VERSION_ID}.noarch.rpm
#fi
if ! rpm --quiet --query rpm-build; then
@@ -97,18 +97,28 @@ echo '%files' >> SPECS/mediacenter.spec
echo "%{_bindir}/mediacenter${mversion}" >> SPECS/mediacenter.spec
echo '"%{_libdir}/jriver"' >> SPECS/mediacenter.spec
echo '%{_datadir}' >> SPECS/mediacenter.spec
echo '/etc/security/limits.d/mediacenter.conf' >> SPECS/mediacenter.spec
echo "/etc/security/limits.d/mediacenter${mversion}.conf" >> SPECS/mediacenter.spec
# Acquire deb
if [ ! -f $builddir/SOURCES/MediaCenter-${version}-amd64.deb ]; then
echo "${bold}Downloading source DEB...${normal}"
wget -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb http://files.jriver.com/mediacenter/channels/v${mversion}/latest/MediaCenter-${version}-amd64.deb
if [ $? -ne 0 ]; then
echo "${bold}Specified Media Center version not found!${normal}"
read -p "${bold}If beta version, enter beta password to retry, otherwise Ctrl-C to exit: ${normal}" betapwd
wget -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb http://files.jriver.com/mediacenter/channels/v${mversion}/beta/${betapwd}/MediaCenter-${version}-amd64.deb
if [ $? -ne 0 ]; then
echo "Beta password wrong or specified Media Center version not found, exiting..."
exit 1
fi
fi
fi
# Run rpm-build
echo "${bold}Converting DEB to RPM...${normal}"
cd ${builddir}/SPECS
rpmbuild --define="%_topdir $builddir" --define="%_variation $variation" --define="%_tversion ${mversion}" --define="%_version ${version}" --define="%_libdir /usr/lib" -bb mediacenter.spec > /dev/null 2>&1
rpmbuild --quiet --define="%_topdir $builddir" --define="%_variation $variation" --define="%_tversion ${mversion}" --define="%_version ${version}" --define="%_libdir /usr/lib" -bb mediacenter.spec
# Install RPM
if [ -f $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.${SID}${release}.x86_64.rpm ] ; then