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

Allow services alias

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-25 09:44:22 -05:00
parent 3adf6ff2aa
commit 6bd9fb666c
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
installJRMC
View File

@@ -124,8 +124,8 @@ execute() {
parseInput() { parseInput() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -g BUILD_SWITCH REPO_INSTALL_SWITCH COMPAT_SWITCH declare -g BUILD_SWITCH REPO_INSTALL_SWITCH COMPAT_SWITCH TEST_SWITCH
declare -g LOCAL_INSTALL_SWITCH CREATEREPO_SWITCH UNINSTALL_SWITCH TEST_SWITCH declare -g LOCAL_INSTALL_SWITCH CREATEREPO_SWITCH UNINSTALL_SWITCH
declare -g OUTPUTDIR RESTOREFILE BETAPASS SERVICE_TYPE VNCPASS USER_DISPLAY CREATEREPO_WEBROOT declare -g OUTPUTDIR RESTOREFILE BETAPASS SERVICE_TYPE VNCPASS USER_DISPLAY CREATEREPO_WEBROOT
declare -ga SERVICES CONTAINERS declare -ga SERVICES CONTAINERS
declare long_opts short_opts input declare long_opts short_opts input
@@ -142,7 +142,7 @@ parseInput() {
fi fi
long_opts="install:,build::,outputdir:,mcversion:,restorefile:,betapass:," long_opts="install:,build::,outputdir:,mcversion:,restorefile:,betapass:,"
long_opts+="service-type:,service:,version,debug,help,uninstall,createrepo::," long_opts+="service-type:,service:,services:,version,debug,help,uninstall,createrepo::,"
long_opts+="createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,compat" long_opts+="createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,compat"
short_opts="+i:vb::dhus:c:" short_opts="+i:vb::dhus:c:"
@@ -181,7 +181,7 @@ parseInput() {
--service-type) --service-type)
shift && SERVICE_TYPE="$1" shift && SERVICE_TYPE="$1"
;; ;;
--service|-s) --service|-s|--services)
shift && SERVICES+=("$1") shift && SERVICES+=("$1")
;; ;;
--createrepo) --createrepo)
@@ -524,7 +524,8 @@ installMCFromRepo() {
sudo bash -c "cat <<-EOF > $repo_dir/jriver.list sudo bash -c "cat <<-EOF > $repo_dir/jriver.list
deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main
EOF" EOF"
wget -qO- "http://dist.jriver.com/mediacenter@jriver.com.gpg.key" | sudo tee /etc/apt/trusted.gpg.d/jriver.asc &>/dev/null wget -qO- "http://dist.jriver.com/mediacenter@jriver.com.gpg.key" |
sudo tee /etc/apt/trusted.gpg.d/jriver.asc &>/dev/null
;; ;;
*) *)
err "An MC repository for $ID is not yet available" err "An MC repository for $ID is not yet available"
@@ -541,11 +542,13 @@ installMCFromRepo() {
# Install mesa-va-drivers-freeworld separately from the RPM for dnf swap # Install mesa-va-drivers-freeworld separately from the RPM for dnf swap
installMesa installMesa
pkg_install_cmd=(installPackage pkg_install_cmd=(
installPackage
--skip-check-installed --skip-check-installed
--allow-downgrades --allow-downgrades
--no-gpg-check --no-gpg-check
"$MCPKG") "$MCPKG"
)
if ! execute "${pkg_install_cmd[*]}"; then if ! execute "${pkg_install_cmd[*]}"; then
err "Package install failed!" err "Package install failed!"
return 1 return 1
@@ -825,7 +828,11 @@ installMesa() {
fedora|centos) fedora|centos)
if ! pkg_query mesa-va-drivers-freeworld &>/dev/null; then if ! pkg_query mesa-va-drivers-freeworld &>/dev/null; then
if pkg_query mesa-va-drivers &>/dev/null; then if pkg_query mesa-va-drivers &>/dev/null; then
pkg_swap_cmd=(pkg_swap mesa-va-drivers mesa-va-drivers-freeworld) pkg_swap_cmd=(
pkg_swap
mesa-va-drivers
mesa-va-drivers-freeworld
)
if ! execute "${pkg_swap_cmd[*]}"; then if ! execute "${pkg_swap_cmd[*]}"; then
err "Package swap failed!" err "Package swap failed!"
return 1 return 1
@@ -839,7 +846,6 @@ installMesa() {
} }
####################################### #######################################
# Installs local Media Center PKGBUILD # Installs local Media Center PKGBUILD
####################################### #######################################
@@ -1321,7 +1327,8 @@ service_jriver-x11vnc() {
# If .Xauthority file is missing, generate a dummy for x11vnc -auth guess # If .Xauthority file is missing, generate a dummy for x11vnc -auth guess
if [[ ! -f "$HOME/.Xauthority" ]]; then if [[ ! -f "$HOME/.Xauthority" ]]; then
[[ "$XDG_SESSION_TYPE" == "wayland" ]] && ask_ok "Unsupported Wayland session detected for x11vnc, continue?" || return 1 [[ "$XDG_SESSION_TYPE" == "wayland" ]] &&
ask_ok "Unsupported Wayland session detected for x11vnc, continue?" || return 1
touch "$HOME/.Xauthority" touch "$HOME/.Xauthority"
xauth generate "$DISPLAY" . trusted xauth generate "$DISPLAY" . trusted
xauth add "$HOST$DISPLAY" . "$(xxd -l 16 -p /dev/urandom)" xauth add "$HOST$DISPLAY" . "$(xxd -l 16 -p /dev/urandom)"
@@ -1381,7 +1388,7 @@ service_jriver-createrepo() {
sudo bash -c "cat <<-EOF > $SERVICE_FNAME sudo bash -c "cat <<-EOF > $SERVICE_FNAME
[Unit] [Unit]
Description=Builds JRiver Media Center RPM file, moves it to the repo dir, and runs createrepo Description=Builds JRiver Media Center RPM, moves it to the repo dir, and runs createrepo
[Service] [Service]
$USER_STRING $USER_STRING
@@ -1723,7 +1730,7 @@ main() {
for service in "${SERVICES[@]}"; do for service in "${SERVICES[@]}"; do
if ! "service_$service"; then if ! "service_$service"; then
if [[ $? -eq 127 ]]; then if [[ $? -eq 127 ]]; then
err "Service $service does not exist, check your service name" err "Service $service does not exist, check service name"
else else
err "Failed to create service: $service" err "Failed to create service: $service"
fi fi
@@ -1734,7 +1741,7 @@ main() {
# for _container in "${CONTAINERS[@]}"; do # for _container in "${CONTAINERS[@]}"; do
# if ! "_container_$_container"; then # if ! "_container_$_container"; then
# if [[ $? -eq 127 ]]; then # if [[ $? -eq 127 ]]; then
# err "Container $_container does not exist, check your container name" # err "Container $_container does not exist, check container name"
# else # else
# err "Failed to create container: $_container" # err "Failed to create container: $_container"
# fi # fi