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

Clean up OS commands

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-13 14:02:58 -04:00
parent c6b36b06b2
commit c583a474ef
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
installJRMC
View File

@@ -204,13 +204,16 @@ EOF
_install_cmd=("dnf" "install" "-y") _install_cmd=("dnf" "install" "-y")
_update_cmd=("dnf" "makecache" "-y") _update_cmd=("dnf" "makecache" "-y")
_pkg_query_cmd=("rpm" "-q") _pkg_query_cmd=("rpm" "-q")
_firewall_cmd=("firewall-cmd")
elif [[ "$ID" =~ ^(ubuntu|debian)$ ]]; then elif [[ "$ID" =~ ^(ubuntu|debian)$ ]]; then
_install_cmd=("apt-get" "install" "-y") _install_cmd=("apt-get" "install" "-y")
_update_cmd=("apt-get" "update" "-y") _update_cmd=("apt-get" "update" "-y")
_pkg_query_cmd=("dpkg" "-l") _pkg_query_cmd=("dpkg" "-l")
_firewall_cmd=("ufw")
fi fi
_bash_cmd=("bash" "-c") _bash_cmd=("bash" "-c")
_rm_cmd=("rm" "-rf")
_install_cmd_nogpg=("${_install_cmd[@]}" "--nogpgcheck") _install_cmd_nogpg=("${_install_cmd[@]}" "--nogpgcheck")
@@ -220,6 +223,8 @@ EOF
_install_cmd_nogpg=("sudo" "${_install_cmd_nogpg[@]}") _install_cmd_nogpg=("sudo" "${_install_cmd_nogpg[@]}")
_update_cmd=("sudo" "${_update_cmd[@]}") _update_cmd=("sudo" "${_update_cmd[@]}")
_bash_cmd=("sudo" "${_bash_cmd[@]}") _bash_cmd=("sudo" "${_bash_cmd[@]}")
_bash_cmd=("sudo" "${_rm_cmd[@]}")
_firewall_cmd=("sudo" "${_firewall_cmd[@]}")
#_pkg_query_cmd=("sudo" "${_pkg_query_cmd[@]}") #_pkg_query_cmd=("sudo" "${_pkg_query_cmd[@]}")
fi fi
@@ -252,12 +257,12 @@ EOF
done done
if [[ ${#_pkg_array[@]} -ge 1 ]]; then if [[ ${#_pkg_array[@]} -ge 1 ]]; then
[[ -n $_debug ]] && echo "Installing: " "${_pkg_array[@]}" echo "Installing: " "${_pkg_array[@]}"
"${_install_cmd[@]}" "${_pkg_array[@]}" > /dev/null 2>&1 "${_install_cmd[@]}" "${_pkg_array[@]}" > /dev/null 2>&1
fi fi
if [[ ${#_url_pkg_array[@]} -ge 1 ]]; then if [[ ${#_url_pkg_array[@]} -ge 1 ]]; then
[[ -n $_debug ]] && echo "Installing: " "${_url_pkg_array[@]}" echo "Installing: " "${_url_pkg_array[@]}"
"${_install_cmd_nogpg[@]}" "${_url_pkg_array[@]}" > /dev/null 2>&1 "${_install_cmd_nogpg[@]}" "${_url_pkg_array[@]}" > /dev/null 2>&1
fi fi
@@ -615,18 +620,13 @@ EOF"
# RHEL # RHEL
if [[ "$ID" =~ ^(fedora|centos)$ ]] && [[ -x $(command -v firewall-cmd) ]]; then if [[ "$ID" =~ ^(fedora|centos)$ ]] && [[ -x $(command -v firewall-cmd) ]]; then
if ! firewall-cmd --get-services | grep -q jriver; then if ! firewall-cmd --get-services | grep -q jriver; then
if [[ "$_user" == "root" ]]; then
_firewallcmd=("firewall-cmd")
else
_firewallcmd=("sudo" "firewall-cmd")
fi
# shellcheck disable=SC2140,SC1079,SC1078 # shellcheck disable=SC2140,SC1079,SC1078
"${_firewallcmd[@]}" --permanent --new-service=jriver > /dev/null 2>&1 "${_firewall_cmd[@]}" --permanent --new-service=jriver > /dev/null 2>&1
"${_firewallcmd[@]}" --permanent --service=jriver --set-description="JRiver Media Center Media Server" > /dev/null 2>&1 "${_firewall_cmd[@]}" --permanent --service=jriver --set-description="JRiver Media Center Media Server" > /dev/null 2>&1
"${_firewallcmd[@]}" --permanent --service=jriver --set-short="jriver" > /dev/null 2>&1 "${_firewall_cmd[@]}" --permanent --service=jriver --set-short="jriver" > /dev/null 2>&1
"${_firewallcmd[@]}" --permanent --service=jriver --add-port=52100-52200/tcp > /dev/null 2>&1 "${_firewall_cmd[@]}" --permanent --service=jriver --add-port=52100-52200/tcp > /dev/null 2>&1
"${_firewallcmd[@]}" --permanent --service=jriver --add-port=1900/udp > /dev/null 2>&1 "${_firewall_cmd[@]}" --permanent --service=jriver --add-port=1900/udp > /dev/null 2>&1
"${_firewallcmd[@]}" --reload > /dev/null 2>&1 "${_firewall_cmd[@]}" --reload > /dev/null 2>&1
fi fi
# Ubuntu # Ubuntu
@@ -640,12 +640,7 @@ ports=52100:52200/tcp|1900/udp
EOF" EOF"
fi fi
# Enable service "${_firewall_cmd[@]}" allow jriver > /dev/null 2>&1
if [[ "$_user" == "root" ]]; then
ufw allow jriver > /dev/null 2>&1
else
sudo ufw allow jriver > /dev/null 2>&1
fi
fi fi
} }
@@ -801,26 +796,24 @@ EOF"
sudo systemctl disable --now jriver-createrepo.timer jriver-x11vnc.service jriver-mediaserver.service sudo systemctl disable --now jriver-createrepo.timer jriver-x11vnc.service jriver-mediaserver.service
echo "Removing repo and service files" echo "Removing repo and service files"
for _service in "jriver-mediaserver" "jriver-x11vnc" "jriver-createrepo"; do for _service in "jriver-mediaserver" "jriver-x11vnc" "jriver-createrepo"; do
[[ -f "/usr/lib/systemd/system/$_service.service" ]] \ _generateServiceVars _service
&& sudo rm -f "/usr/lib/systemd/system/$_service.service" [[ -f "$_service_fname" ]] && "${_rm_cmd[@]}" "$_service_fname"
[[ -f "$HOME/.config/systemd/user/$_service.service" ]] \ [[ -f "$_timer_fname" ]] && "${_rm_cmd[@]}" "$_timer_fname"
&& sudo rm -f "$HOME/.config/systemd/user/$_service.service"
done done
[[ -e /etc/yum.repos.d/jriver.repo ]] \ [[ -f "/etc/yum.repos.d/jriver.repo" ]] \
&& sudo rm -f "/etc/yum.repos.d/jriver.repo" && "${_rm_cmd[@]}" "/etc/yum.repos.d/jriver.repo"
[[ -e /etc/apt/sources.list.d/jriver.list ]] \ [[ -f "/etc/apt/sources.list.d/jriver.list" ]] \
&& sudo rm -f "/etc/apt/sources.list.d/jriver.list" && "${_rm_cmd[@]}" "/etc/apt/sources.list.d/jriver.list"
sudo rm /etc/apt/sources.list.d/mediacenter26.list
if [[ -x $(command -v firewall-cmd) ]]; then if [[ -x $(command -v firewall-cmd) ]]; then
echo "Removing firewall rules" echo "Removing firewall rules"
sudo firewall-cmd --permanent --remove-service=jriver sudo firewall-cmd --permanent --remove-service=jriver
sudo firewall-cmd --permanent --delete-service=jriver sudo firewall-cmd --permanent --delete-service=jriver
sudo firewall-cmd --reload sudo firewall-cmd --reload
fi elif [[ -x $(command -v ufw) ]]; then
if [[ -x $(command -v ufw) ]]; then
echo "Removing firewall rules" echo "Removing firewall rules"
sudo ufw delete allow jriver sudo ufw delete allow jriver
[[ -f "/etc/ufw/applications.d/jriver.service" ]] && sudo rm /etc/ufw/applications.d/jriver.service [[ -f "/etc/ufw/applications.d/jriver.service" ]] \
&& "${_rm_cmd[@]}" /etc/ufw/applications.d/jriver.service
fi fi
echo "Uninstalling Media Center" echo "Uninstalling Media Center"
if [[ "$ID" =~ ^(fedora|centos)$ ]]; then if [[ "$ID" =~ ^(fedora|centos)$ ]]; then
@@ -829,7 +822,7 @@ EOF"
sudo apt-get remove "mediacenter$_mversion" -y sudo apt-get remove "mediacenter$_mversion" -y
fi fi
echo "JRiver Media Center has been completely uninstalled" echo "JRiver Media Center has been completely uninstalled"
[[ "$_user" != "root" ]] && echo "Your library files will remain at $HOME/.jriver" echo "Your library files will remain at $HOME/.jriver"
} }