sammyette
/
Hilbish
mirror of https://github.com/Hilbis/Hilbish
2
2
Fork 0
Code Issues Releases Wiki Activity

refactor: use curuser to get homedir everywhere

dev
TorchedSammy 2021-12-01 18:31:04 -04:00
parent effd028658
commit 2e21af4d6b
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hilbish.go
View File

@ -35,14 +35,14 @@ func HilbishLoader(L *lua.LState) int {
util.SetField(L, mod, "ver", lua.LString(version), "Hilbish version") util.SetField(L, mod, "ver", lua.LString(version), "Hilbish version")
util.SetField(L, mod, "user", lua.LString(username), "Username of user") util.SetField(L, mod, "user", lua.LString(username), "Username of user")
util.SetField(L, mod, "host", lua.LString(host), "Host name of the machine") util.SetField(L, mod, "host", lua.LString(host), "Host name of the machine")
util.SetField(L, mod, "home", lua.LString(homedir), "Home directory of the user") util.SetField(L, mod, "home", lua.LString(curuser.HomeDir), "Home directory of the user")
util.SetField(L, mod, "dataDir", lua.LString(dataDir), "Directory for Hilbish's data files") util.SetField(L, mod, "dataDir", lua.LString(dataDir), "Directory for Hilbish's data files")
util.SetField(L, mod, "interactive", lua.LBool(interactive), "If this is an interactive shell") util.SetField(L, mod, "interactive", lua.LBool(interactive), "If this is an interactive shell")
util.SetField(L, mod, "login", lua.LBool(interactive), "Whether this is a login shell") util.SetField(L, mod, "login", lua.LBool(interactive), "Whether this is a login shell")
xdg := L.NewTable() xdg := L.NewTable()
util.SetField(L, xdg, "config", lua.LString(confDir), "XDG config directory") util.SetField(L, xdg, "config", lua.LString(confDir), "XDG config directory")
util.SetField(L, xdg, "data", lua.LString(getenv("XDG_DATA_HOME", homedir + "/.local/share")), "XDG data directory") util.SetField(L, xdg, "data", lua.LString(getenv("XDG_DATA_HOME", curuser.HomeDir + "/.local/share")), "XDG data directory")
L.SetField(mod, "xdg", xdg) L.SetField(mod, "xdg", xdg)
util.Document(L, xdg, "Variables for the XDG base directory spec.") util.Document(L, xdg, "Variables for the XDG base directory spec.")

4
lua.go
View File

@ -89,13 +89,13 @@ func RunConfig(confpath string) {
} }
func RunLogin() { func RunLogin() {
if _, err := os.Stat(homedir + "/.hprofile.lua"); os.IsNotExist(err) { if _, err := os.Stat(curuser.HomeDir + "/.hprofile.lua"); os.IsNotExist(err) {
return return
} }
if !login { if !login {
return return
} }
err := l.DoFile(homedir + "/.hprofile.lua") err := l.DoFile(curuser.HomeDir + "/.hprofile.lua")
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err, fmt.Fprintln(os.Stderr, err,
"\nAn error has occured while loading your login config!n") "\nAn error has occured while loading your login config!n")

5
main.go
View File

@ -28,7 +28,6 @@ var (
aliases = map[string]string{} aliases = map[string]string{}
luaCompletions = map[string]*lua.LFunction{} luaCompletions = map[string]*lua.LFunction{}
homedir string
confDir string confDir string
curuser *user.User curuser *user.User
@ -38,9 +37,9 @@ var (
) )
func main() { func main() {
homedir, _ = os.UserHomeDir()
confDir = getenv("XDG_CONFIG_HOME", homedir + "/.config")
curuser, _ = user.Current() curuser, _ = user.Current()
homedir := curuser.HomeDir
confDir = getenv("XDG_CONFIG_HOME", homedir + "/.config")
preloadPath = strings.Replace(preloadPath, "~", homedir, 1) preloadPath = strings.Replace(preloadPath, "~", homedir, 1)
sampleConfPath = strings.Replace(sampleConfPath, "~", homedir, 1) sampleConfPath = strings.Replace(sampleConfPath, "~", homedir, 1)

2
rl.go
View File

@ -53,7 +53,7 @@ func NewLineReader(prompt string) *LineReader {
fileCompletions := append(completions, readline.FilenameCompleter(query, ctx)...) fileCompletions := append(completions, readline.FilenameCompleter(query, ctx)...)
// filter out executables // filter out executables
for _, f := range fileCompletions { for _, f := range fileCompletions {
name := strings.Replace(f, "~", homedir, 1) name := strings.Replace(f, "~", curuser.HomeDir, 1)
if info, err := os.Stat(name); err == nil && info.Mode().Perm() & 0100 == 0 { if info, err := os.Stat(name); err == nil && info.Mode().Perm() & 0100 == 0 {
continue continue
} }