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

Add --universal flag

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-02 01:52:40 -05:00
parent 2bb37d1e7a
commit e614ad023b
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -47,6 +47,8 @@ You can always find the latest supported options by running `installJRMC --help`
The webroot directory to install the repo (Default: /srv/jriver/) The webroot directory to install the repo (Default: /srv/jriver/)
--createrepo-user USER --createrepo-user USER
The web server user (Default: current user) The web server user (Default: current user)
--universal
Build/install RPM without minimum version specifiers
--version, -v --version, -v
Print this script version and exit Print this script version and exit
--debug, -d --debug, -d

22
installJRMC
View File

@@ -23,7 +23,7 @@ shopt -s extglob
_scriptversion="1.0b5" _scriptversion="1.0b5"
_outputdir="$PWD/output" _outputdir="$PWD/output"
_createrepo_webroot="/var/www/jriver" _createrepo_webroot="/var/www/jriver"
_exec_user="$(whoami)" _exec_user=$(whoami)
_systemddir="/usr/lib/systemd/system" _systemddir="/usr/lib/systemd/system"
# MC version # MC version
@@ -68,6 +68,8 @@ printHelp() {
The web server user (Default: current user) The web server user (Default: current user)
--createrepo-suse --createrepo-suse
Override OS detection and run --createrepo with SUSE RPM Override OS detection and run --createrepo with SUSE RPM
--universal
Build/install RPM without minimum version specifiers
--version, -v --version, -v
Print this script version and exit Print this script version and exit
--debug, -d --debug, -d
@@ -236,7 +238,7 @@ parseInput() {
_install="repo" _install="repo"
fi fi
if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests -- "$@"); then if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,universal -- "$@"); then
eval set -- "$_input" eval set -- "$_input"
while true; do while true; do
case "$1" in case "$1" in
@@ -297,6 +299,9 @@ parseInput() {
--display) --display)
shift && _display="$1" shift && _display="$1"
;; ;;
--universal)
_universal=true
;;
--container|-c) --container|-c)
shift && _containers+=("$1") shift && _containers+=("$1")
;; ;;
@@ -641,6 +646,8 @@ buildRPM() {
Requires: vulkan-headers >= 1.1 Requires: vulkan-headers >= 1.1
Requires: ca-certificates Requires: ca-certificates
Requires: libXScrnSaver Requires: libXScrnSaver
Recommends: vorbis-tools >= 1.4.0
Recommends: lame >= 3.0
EOF EOF
# SUSE dependency name variations # SUSE dependency name variations
@@ -684,7 +691,11 @@ buildRPM() {
EOF EOF
fi fi
#debug "Requires: $_requires" if [[ -v _universal ]]; then
# Strip minimum versions
_custom_requires=$(echo "$_custom_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')
_global_requires=$(echo "$_global_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')
fi
# Create spec file # Create spec file
cat <<- EOF > "$_outputdir/SPECS/mediacenter.spec" cat <<- EOF > "$_outputdir/SPECS/mediacenter.spec"
@@ -703,9 +714,6 @@ buildRPM() {
${_global_requires:-} ${_global_requires:-}
${_custom_requires:-} ${_custom_requires:-}
Recommends: vorbis-tools >= 1.4.0
Recommends: lame >= 3.0
Provides: mediacenter$_mversion Provides: mediacenter$_mversion
License: Copyright 1998-2022, JRiver, Inc. All rights reserved. Protected by U.S. patents #7076468 and #7062468 License: Copyright 1998-2022, JRiver, Inc. All rights reserved. Protected by U.S. patents #7076468 and #7062468
@@ -1477,7 +1485,7 @@ main() {
#rpm --upgrade "$_mcrpm" #rpm --upgrade "$_mcrpm"
if installPackage --nocheck --nogpgcheck --nobest "$_mcrpm"; then if installPackage --nocheck --nogpgcheck "$_mcrpm"; then
echo "JRiver Media Center installed successfully" echo "JRiver Media Center installed successfully"
else else
err "JRiver Media Center installation failed" err "JRiver Media Center installation failed"