Squashing service_type bug

This commit is contained in:
2022-01-12 13:09:01 -05:00
parent 43dbdddfdd
commit f8c60b6240

View File

@@ -900,8 +900,6 @@ 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"
@@ -909,6 +907,7 @@ setServiceVars() {
fi fi
if [[ "$service_type" == "system" ]]; then if [[ "$service_type" == "system" ]]; then
echo "HERERERER: service_type: $service_type"
service_dir="$service_system_dir" service_dir="$service_system_dir"
EXEC_USER="root" EXEC_USER="root"
systemctl_reload_cmd(){ sudo systemctl daemon-reload; } systemctl_reload_cmd(){ sudo systemctl daemon-reload; }