From d47d23ea3e4317734a911441d77c7799be08e10b Mon Sep 17 00:00:00 2001 From: leath-dub Date: Fri, 14 Jun 2024 19:34:42 +0100 Subject: [PATCH] moved linux and freebsd file to a single unix file --- vars_linux.go | 21 --------------------- vars_freebsd.go => vars_unix.go | 6 +++--- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 vars_linux.go rename vars_freebsd.go => vars_unix.go (87%) diff --git a/vars_linux.go b/vars_linux.go deleted file mode 100644 index e1160ba..0000000 --- a/vars_linux.go +++ /dev/null @@ -1,21 +0,0 @@ -// +build linux - -package main - -// String vars that are free to be changed at compile time -var ( - requirePaths = commonRequirePaths + `.. ';' - .. hilbish.dataDir .. '/libs/?/init.lua;' - .. hilbish.dataDir .. '/libs/?/?.lua;'` + linuxUserPaths - linuxUserPaths = ` - .. hilbish.userDir.data .. '/hilbish/libs/?/init.lua;' - .. hilbish.userDir.data .. '/hilbish/libs/?/?.lua;' - .. hilbish.userDir.data .. '/hilbish/libs/?.lua;' - .. hilbish.userDir.config .. '/hilbish/?/init.lua;' - .. hilbish.userDir.config .. '/hilbish/?/?.lua;' - .. hilbish.userDir.config .. '/hilbish/?.lua'` - dataDir = "/usr/local/share/hilbish" - preloadPath = dataDir + "/nature/init.lua" - sampleConfPath = dataDir + "/.hilbishrc.lua" // Path to default/sample config - defaultConfDir = "" -) diff --git a/vars_freebsd.go b/vars_unix.go similarity index 87% rename from vars_freebsd.go rename to vars_unix.go index cc1cb93..224a295 100644 --- a/vars_freebsd.go +++ b/vars_unix.go @@ -1,4 +1,4 @@ -// +build freebsd +// +build linux freebsd package main @@ -6,8 +6,8 @@ package main var ( requirePaths = commonRequirePaths + `.. ';' .. hilbish.dataDir .. '/libs/?/init.lua;' - .. hilbish.dataDir .. '/libs/?/?.lua;'` + freebsdUserPaths - freebsdUserPaths = ` + .. hilbish.dataDir .. '/libs/?/?.lua;'` + unixUserPaths + unixUserPaths = ` .. hilbish.userDir.data .. '/hilbish/libs/?/init.lua;' .. hilbish.userDir.data .. '/hilbish/libs/?/?.lua;' .. hilbish.userDir.data .. '/hilbish/libs/?.lua;'