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

Revert to dev and fix comments

Browse Source
This commit is contained in:
Bryan Roessler
2024-11-04 11:33:54 -05:00
parent d68e4c7587
commit d1fb17b86e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installJRMC
View File

@@ -15,7 +15,7 @@
# 1. No createrepo on Mint # 1. No createrepo on Mint
shopt -s extglob shopt -s extglob
declare -g SCRIPT_VERSION="1.3.10" declare -g SCRIPT_VERSION="1.3.11-dev"
declare -g MC_REPO="bullseye" # should match the MC_VERSION declare -g MC_REPO="bullseye" # should match the MC_VERSION
declare -g MC_VERSION="33.0.37" # Do find all replace declare -g MC_VERSION="33.0.37" # Do find all replace
declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33 declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33
@@ -539,7 +539,7 @@ install_external_repos() {
# Install mesa-va-drivers-freeworld separately from the RPM using dnf swap # Install mesa-va-drivers-freeworld separately from the RPM using dnf swap
install_mesa_freeworld install_mesa_freeworld
;; ;;
suse) suse) # TODO may eventually be needed if X11_XOrg is not available by default
# if ! zypper repos | grep -q "X11_XOrg"; then # if ! zypper repos | grep -q "X11_XOrg"; then
# echo "Installing the X11 repository" # echo "Installing the X11 repository"
# execute sudo zypper --non-interactive --quiet addrepo \ # execute sudo zypper --non-interactive --quiet addrepo \
@@ -847,8 +847,7 @@ build_rpm() {
echo "Build successful. The RPM file is located at: $MC_RPM" echo "Build successful. The RPM file is located at: $MC_RPM"
else else
err "Build failed" err "Build failed"
# For automation, let's remove the source DEB and reaquire it on next # After failire, remove the source DEB and reaquire it on next run
# run after failure in case it is corrupted or buggy
[[ -f $MC_DEB ]] && echo "Removing source DEB" && execute rm -f "$MC_DEB" [[ -f $MC_DEB ]] && echo "Removing source DEB" && execute rm -f "$MC_DEB"
exit 1 exit 1
fi fi
@@ -888,7 +887,6 @@ install_mc_deb() {
"$MC_DEB" "$MC_DEB"
} }
# @description Installs Media Center RPM package on RHEL distros # @description Installs Media Center RPM package on RHEL distros
install_mc_rhel() { install_mc_rhel() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"