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

Squashing service_type bug

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-12 13:07:51 -05:00
parent eb328453ea
commit 43dbdddfdd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installJRMC
View File

@@ -900,6 +900,8 @@ setServiceVars() {
declare service_user_dir="$USER_HOME/.config/systemd/user" declare service_user_dir="$USER_HOME/.config/systemd/user"
declare service_type="${SERVICE_TYPE:-'system'}" declare service_type="${SERVICE_TYPE:-'system'}"
echo "service_type: $service_type, SERVICE_TYPE: $SERVICE_TYPE"
if [[ "$USER" == "root" && "$service_type" == "user" ]]; then if [[ "$USER" == "root" && "$service_type" == "user" ]]; then
err "Trying to install user service as root" err "Trying to install user service as root"
err "Use --service-type service and/or execute installJRMC as non-root user" err "Use --service-type service and/or execute installJRMC as non-root user"
@@ -924,8 +926,6 @@ setServiceVars() {
systemctl_is_active(){ sudo systemctl is-active -q "$@"; } systemctl_is_active(){ sudo systemctl is-active -q "$@"; }
fi fi
systemctl_reload_cmd && echo "YES!!!!"
[[ ! -d "$service_dir" ]] && sudo -u "$EXEC_USER" mkdir -p "$service_dir" [[ ! -d "$service_dir" ]] && sudo -u "$EXEC_USER" mkdir -p "$service_dir"
if [[ "$USER" == "root" || "$service_type" == "user" ]]; then if [[ "$USER" == "root" || "$service_type" == "user" ]]; then