bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Get sources from https and fix SOURCES dir creation

Browse Source
This commit is contained in:
Bryan Roessler
2019-06-18 16:21:21 -04:00
parent 4d7cf29144
commit 81787c6a3b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
install_MC_fedora.sh
View File

@@ -80,6 +80,9 @@ find_os () {
get_source_deb () { get_source_deb () {
# If necessary, create SOURCES dir
[ -d SOURCES ] || mkdir -p SOURCES
# If deb file exists, skip download # If deb file exists, skip download
if [ -f $builddir/SOURCES/MediaCenter-${version}-amd64.deb ]; then if [ -f $builddir/SOURCES/MediaCenter-${version}-amd64.deb ]; then
echo "Using local DEB file: $builddir/SOURCES/MediaCenter-${version}-amd64.deb" echo "Using local DEB file: $builddir/SOURCES/MediaCenter-${version}-amd64.deb"
@@ -89,17 +92,17 @@ get_source_deb () {
# Acquire DEB # Acquire DEB
echo "Attempting to download MC $version DEB file..." echo "Attempting to download MC $version DEB file..."
wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \ wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \
http://files.jriver.com/mediacenter/channels/v${mversion}/latest/MediaCenter-${version}-amd64.deb https://files.jriver.com/mediacenter/channels/v${mversion}/latest/MediaCenter-${version}-amd64.deb
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Specified Media Center version not found! Retrying the test repo..." echo "Specified Media Center version not found! Retrying the test repo..."
wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \ wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \
http://files.jriver.com/mediacenter/test/MediaCenter-${version}-amd64.deb https://files.jriver.com/mediacenter/test/MediaCenter-${version}-amd64.deb
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
[ -z $betapwd ] && read -t 60 -p "Not found in test repo, if beta version, enter beta password to retry, otherwise Ctrl-C to exit: " betapwd [ -z $betapwd ] && read -t 60 -p "Not found in test repo, if beta version, enter beta password to retry, otherwise Ctrl-C to exit: " betapwd
[ -z $betapwd ] && echo "Cannot find DEB file, re-check version number or beta password. Exiting..." && exit 1 [ -z $betapwd ] && echo "Cannot find DEB file, re-check version number or beta password. Exiting..." && exit 1
wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \ wget -q -O $builddir/SOURCES/MediaCenter-${version}-amd64.deb \
http://files.jriver.com/mediacenter/channels/v${mversion}/beta/${betapwd}/MediaCenter-${version}-amd64.deb https://files.jriver.com/mediacenter/channels/v${mversion}/beta/${betapwd}/MediaCenter-${version}-amd64.deb
[ $? -ne 0 ] && echo "Cannot find DEB file, re-check version number or beta password. Exiting..." && exit 1 [ $? -ne 0 ] && echo "Cannot find DEB file, re-check version number or beta password. Exiting..." && exit 1
fi fi
@@ -128,16 +131,15 @@ install_dependencies () {
build_rpm () { build_rpm () {
# If necessary, make build directories
[ -d SPECS ] || mkdir -p SPECS
# skip rebuilding the rpm if it already exists # skip rebuilding the rpm if it already exists
if [ -f $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.x86_64.rpm ]; then if [ -f $builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.x86_64.rpm ]; then
echo "$builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.x86_64.rpm already exists! Skipping build step..." echo "$builddir/RPMS/x86_64/MediaCenter-${mversion}-${variation}.x86_64.rpm already exists! Skipping build step..."
return return
fi fi
# If necessary, make build directories
[ -d SOURCES ] || mkdir -p SOURCES
[ -d SPECS ] || mkdir -p SPECS
# Create spec file # Create spec file
echo 'Name: MediaCenter' > SPECS/mediacenter.spec echo 'Name: MediaCenter' > SPECS/mediacenter.spec
echo 'Version: %{_tversion}' >> SPECS/mediacenter.spec echo 'Version: %{_tversion}' >> SPECS/mediacenter.spec