From b77e6834fc58c699effe20439cdb11a1fd726f05 Mon Sep 17 00:00:00 2001 From: cryobry <38270216+cryobry@users.noreply.github.com> Date: Wed, 30 May 2018 16:48:02 -0400 Subject: [PATCH] Complete CentOS logic, and use default .desktop file --- install_MC_fedora.sh | 54 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/install_MC_fedora.sh b/install_MC_fedora.sh index 4ea7831..7fbec58 100755 --- a/install_MC_fedora.sh +++ b/install_MC_fedora.sh @@ -19,31 +19,39 @@ else exit 1 fi -# Use RHEL RPMFusion repos for CentOS +# Set repo IDs and package manager based on distro if [ $ID = "centos" ]; then ID="el" + SID="el" + PM="yum" +elif [ $ID = "fedora" ]; then + ID="fedora" + SID="fc" + PM="dnf" fi +# If necessary, install RPMFusion repos, dpkg, and rpm-build if ! rpm --quiet --query rpmfusion-free-release; then echo "${bold}Installing rpmfusion-free-release repo...${normal}" - sudo dnf -y --nogpgcheck install https://download1.rpmfusion.org/free/${ID}/rpmfusion-free-release-${VERSION_ID}.noarch.rpm + sudo ${PM} -y --nogpgcheck install https://download1.rpmfusion.org/free/${ID}/rpmfusion-free-release-${VERSION_ID}.noarch.rpm fi if ! rpm --quiet --query rpmfusion-nonfree-release; then echo "${bold}Installing rpmfusion-nonfree-release repo...${normal}" - sudo dnf -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 echo "${bold}Installing rpm-build...${normal}" - sudo dnf install rpm-build -y + sudo ${PM} install rpm-build -y fi if ! rpm --quiet --query dpkg; then echo "${bold}Installing dpkg...${normal}" - sudo dnf install dpkg -y + sudo ${PM} install dpkg -y fi +# If necessary, make build directories [ -d SOURCES ] || mkdir -p SOURCES [ -d SPECS ] || mkdir -p SPECS @@ -54,9 +62,8 @@ echo 'Release: %{?_variation:%{_variation}}%{?dist}' >> SPECS/mediacenter.spec echo 'Summary: JRiver Media Center' >> SPECS/mediacenter.spec echo 'Group: Applications/Media' >> SPECS/mediacenter.spec echo "Source0: http://files.jriver.com/mediacenter/channels/v${mversion}/latest/MediaCenter-%{_version}-amd64.deb" >> SPECS/mediacenter.spec -echo "Source1: mediacenter${mversion}.desktop" >> SPECS/mediacenter.spec echo '' >> SPECS/mediacenter.spec -echo 'BuildRequires: rpm >= 4.12.0' >> SPECS/mediacenter.spec +echo 'BuildRequires: rpm >= 4.11.0' >> SPECS/mediacenter.spec echo 'BuildRequires: dpkg' >> SPECS/mediacenter.spec echo 'BuildArch: x86_64' >> SPECS/mediacenter.spec echo '' >> SPECS/mediacenter.spec @@ -88,45 +95,32 @@ echo "%{_bindir}/mediacenter${mversion}" >> SPECS/mediacenter.spec echo '"%{_libdir}/jriver"' >> SPECS/mediacenter.spec echo '%{_datadir}' >> SPECS/mediacenter.spec -# Create .desktop file -echo '[Desktop Entry]' > SOURCES/mediacenter${mversion}.desktop -echo 'Name=Media Center' >> SOURCES/mediacenter${mversion}.desktop -echo 'GenericName=Music Player' >> SOURCES/mediacenter${mversion}.desktop -echo "X-GNOME-FullName=JRiver Media Center ${mversion}" >> SOURCES/mediacenter${mversion}.desktop -echo "Comment=JRiver Media Center ${mversion}" >> SOURCES/mediacenter${mversion}.desktop -echo 'Keywords=Audio;Song;MP3;CD;Podcast;MTP;iPod;Playlist;Last.fm;UPnP;DLNA;Radio;' >> SOURCES/mediacenter${mversion}.desktop -echo "Exec=mediacenter${mversion} %U" >> SOURCES/mediacenter${mversion}.desktop -echo 'Terminal=false' >> SOURCES/mediacenter${mversion}.desktop -echo 'Type=Application' >> SOURCES/mediacenter${mversion}.desktop -echo "Icon=/usr/lib/jriver/Media Center ${mversion}/Data/Default Art/Application.ico" >> SOURCES/mediacenter${mversion}.desktop -echo 'Categories=GNOME;GTK;AudioVideo;' >> SOURCES/mediacenter${mversion}.desktop -echo 'MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/ape;audio/x-ape;audio/mac;audio/x-mpegurl;audio/x-flac;x-scheme-handler/itms;' >> SOURCES/mediacenter${mversion}.desktop -echo 'StartupNotify=true' >> SOURCES/mediacenter${mversion}.desktop -echo 'X-GNOME-UsesNotifications=false' >> SOURCES/mediacenter${mversion}.desktop -echo "StartupWMClass=Media Center ${mversion}" >> SOURCES/mediacenter${mversion}.desktop -echo '' >> SOURCES/mediacenter${mversion}.desktop -echo "Name[en_US]=mediacenter${mversion}" >> SOURCES/mediacenter${mversion}.desktop - +# 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 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 -if [ -f $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.fc${release}.x86_64.rpm ] ; then +# Install RPM +if [ -f $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.${SID}${release}.x86_64.rpm ] ; then echo "${bold}Attempting to install RPM...${normal}" - sudo dnf install $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.fc${release}.x86_64.rpm -y && echo "${bold}JRiver Media Center ${version} installed successfully!${normal}" + sudo ${PM} install $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.${SID}${release}.x86_64.rpm -y && echo "${bold}JRiver Media Center ${version} installed successfully!${normal}" else echo "${bold}Conversion Failed!${normal}" exit 1 fi +# Symlink certificates if [ ! -e /etc/ssl/certs/ca-certificates.crt ]; then - echo "${bold}Symlinking ca-certificates for license registration...${normal}" - sudo ln -s /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/ssl/certs/ca-certificates.crt + if [ -e /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ]; then + echo "${bold}Symlinking ca-certificates for license registration...${normal}" + sudo ln -s /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/ssl/certs/ca-certificates.crt + fi fi exit 0