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

Cleanup

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-25 11:27:33 -04:00
parent 2fae2d0ae8
commit 8de870b18a
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
installJRMC
View File

@@ -330,7 +330,7 @@ EOF
fi fi
# Some additional commands specifically for createrepo (primarily to handle user rights) # Some additional commands specifically for createrepo (primarily to handle user rights)
# Could also go in runCreateRepo() but let's leave it here for now # Could also go in runCreaterepo() but let's leave it here for now
if [[ $_createrepo_user != "root" ]]; then if [[ $_createrepo_user != "root" ]]; then
if [[ -d "$_createrepo_webroot/repodata" ]]; then if [[ -d "$_createrepo_webroot/repodata" ]]; then
_createrepo_cmd(){ sudo -u "$_createrepo_user" createrepo -q --update "$@"; } _createrepo_cmd(){ sudo -u "$_createrepo_user" createrepo -q --update "$@"; }
@@ -812,12 +812,14 @@ EOF"
# Returns: # Returns:
# 0 if createrepo is successful, 1 if not # 0 if createrepo is successful, 1 if not
####################################### #######################################
_runCreateRepo() { _runCreaterepo() {
_runDebug "${FUNCNAME[0]}" _runDebug "${FUNCNAME[0]}"
_installPackage createrepo_c _installPackage createrepo_c
local _rpmfile="$1"
# If the webroot does not exist, create it # If the webroot does not exist, create it
if [[ ! -d "$_createrepo_webroot" ]]; then if [[ ! -d "$_createrepo_webroot" ]]; then
if ! _mkdir_cmd "$_createrepo_webroot"; then if ! _mkdir_cmd "$_createrepo_webroot"; then
@@ -828,7 +830,7 @@ EOF"
fi fi
# Copy built rpms to webroot # Copy built rpms to webroot
if ! _cp_cmd "$1" "$_createrepo_webroot"; then if ! _cp_cmd "$_rpmfile" "$_createrepo_webroot"; then
err "Could not copy the RPM to the createrepo-webroot path" err "Could not copy the RPM to the createrepo-webroot path"
err "Make sure that the createrepo-webroot path is writeable by createrepo-user" err "Make sure that the createrepo-webroot path is writeable by createrepo-user"
return 1 return 1
@@ -912,21 +914,12 @@ EOF"
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 [[ -n $_debug ]]; then _firewall_cmd --permanent --new-service=jriver > /dev/null 2>&1
_firewall_cmd --permanent --new-service=jriver _firewall_cmd --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" _firewall_cmd --permanent --service=jriver --set-short="jriver" > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --set-short="jriver" _firewall_cmd --permanent --service=jriver --add-port=52100-52200/tcp > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --add-port=52100-52200/tcp _firewall_cmd --permanent --service=jriver --add-port=1900/udp > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --add-port=1900/udp _firewall_cmd --reload > /dev/null 2>&1
_firewall_cmd --reload
else
_firewall_cmd --permanent --new-service=jriver > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --set-description="JRiver Media Center Media Server" > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --set-short="jriver" > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --add-port=52100-52200/tcp > /dev/null 2>&1
_firewall_cmd --permanent --service=jriver --add-port=1900/udp > /dev/null 2>&1
_firewall_cmd --reload > /dev/null 2>&1
fi
fi fi
elif [[ "$ID" =~ ^(ubuntu|debian)$ ]] && [[ -x $(command -v ufw) ]]; then elif [[ "$ID" =~ ^(ubuntu|debian)$ ]] && [[ -x $(command -v ufw) ]]; then
if [[ ! -f "/etc/ufw/applications.d/jriver.service" ]]; then if [[ ! -f "/etc/ufw/applications.d/jriver.service" ]]; then
@@ -1249,6 +1242,7 @@ EOF"
: :
} }
_containerMC() { _containerMC() {
: :
} }
@@ -1272,27 +1266,30 @@ EOF"
[[ -f "$_timer_fname" ]] && _rm_cmd "$_timer_fname" [[ -f "$_timer_fname" ]] && _rm_cmd "$_timer_fname"
done done
echo "Removing repo files"
[[ -f "/etc/yum.repos.d/jriver.repo" ]] \ [[ -f "/etc/yum.repos.d/jriver.repo" ]] \
&& _rm_cmd "/etc/yum.repos.d/jriver.repo" && _rm_cmd "/etc/yum.repos.d/jriver.repo"
[[ -f "/etc/apt/sources.list.d/jriver.list" ]] \ [[ -f "/etc/apt/sources.list.d/jriver.list" ]] \
&& _rm_cmd "/etc/apt/sources.list.d/jriver.list" && _rm_cmd "/etc/apt/sources.list.d/jriver.list"
echo "Removing firewall rules"
if [[ -x $(command -v firewall-cmd) ]]; then if [[ -x $(command -v firewall-cmd) ]]; then
echo "Removing firewall rules"
_firewall_cmd --permanent --remove-service=jriver _firewall_cmd --permanent --remove-service=jriver
_firewall_cmd --permanent --delete-service=jriver _firewall_cmd --permanent --delete-service=jriver
_firewall_cmd --reload _firewall_cmd --reload
elif [[ -x $(command -v ufw) ]]; then elif [[ -x $(command -v ufw) ]]; then
echo "Removing firewall rules"
_firewall_cmd delete allow jriver _firewall_cmd delete allow jriver
[[ -f "/etc/ufw/applications.d/jriver.service" ]] \ [[ -f "/etc/ufw/applications.d/jriver.service" ]] \
&& _rm_cmd /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
_pkg_remove MediaCenter _pkg_remove MediaCenter
elif [[ "$ID" =~ ^(ubuntu|debian)$ ]]; then elif [[ "$ID" =~ ^(ubuntu|debian)$ ]]; then
_pkg_remove "mediacenter$_mversion" _pkg_remove "mediacenter$_mversion"
fi fi
echo "JRiver Media Center has been completely uninstalled" echo "JRiver Media Center has been completely uninstalled"
echo "If you wish to remove your library files: rm -rf $HOME/.jriver" echo "If you wish to remove your library files: rm -rf $HOME/.jriver"
echo "If you wish to remove your rpmbuild output files: rm -rf $_outputdir" echo "If you wish to remove your rpmbuild output files: rm -rf $_outputdir"
@@ -1319,7 +1316,7 @@ EOF"
# Uninstall and exit # Uninstall and exit
if [[ -n $_uninstall ]]; then if [[ -n $_uninstall ]]; then
_uninstall _uninstall
return $? exit $?
fi fi
# Install MC using package manager # Install MC using package manager
@@ -1339,7 +1336,7 @@ EOF"
# Run createrepo # Run createrepo
if [[ -n $_createrepo ]]; then if [[ -n $_createrepo ]]; then
_runCreateRepo "$_mcrpm" _runCreaterepo "$_mcrpm"
fi fi
# Install the rpm # Install the rpm
@@ -1370,7 +1367,10 @@ EOF"
_serviceMediacenter _serviceMediacenter
;; ;;
mediacenter-vncserver) mediacenter-vncserver)
# important to run _serviceVNC before _serviceMediacenter in order to match
# the correct $_display if --display is not specified by the user
_serviceVNC _serviceVNC
_serviceMediacenter
;; ;;
*) *)
esac esac