Merge pull request #168 from shelltime/claude/fix-shelltime-service-3UYQq

Fix shelltime service not running on Linux

Author: AnnatarHe

model/daemon-installer.linux.go

@@ -166,7 +166,8 @@ func (l *LinuxDaemonInstaller) GetDaemonServiceFile(username string) (buf bytes.
 		return
 	}
 	err = tmpl.Execute(&buf, map[string]string{
-		"UserName": username,
+		"UserName":   username,
+		"BaseFolder": l.baseFolder,
 	})
 	return
 }

model/sys-desc/shelltime.service

@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/bin/sh -c 'exec $(getent passwd $USER | cut -d: -f7) -l -c "{{.BaseFolder}}/bin/shelltime-daemon"'
+ExecStart=/bin/sh -c 'exec $(getent passwd $(id -un) | cut -d: -f7) -l -c "{{.BaseFolder}}/bin/shelltime-daemon"'
 Restart=always
 
 # Resource limits