Squashed it
This commit is contained in:
@@ -898,7 +898,7 @@ setServiceVars() {
|
|||||||
declare -g SERVICE_NAME SERVICE_FNAME TIMER_NAME TIMER_FNAME USER_STRING EXEC_USER
|
declare -g SERVICE_NAME SERVICE_FNAME TIMER_NAME TIMER_FNAME USER_STRING EXEC_USER
|
||||||
declare service_system_dir="/usr/lib/systemd/system"
|
declare service_system_dir="/usr/lib/systemd/system"
|
||||||
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}"
|
||||||
|
|
||||||
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"
|
||||||
@@ -907,7 +907,6 @@ 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; }
|
||||||
|
|||||||
Reference in New Issue
Block a user