build: fix check for macos

chore: revert "build!: just default to /usr/local on linux and macos"
This reverts commit a9e324faa9.
2022-12-11 17:05:06 -04:00 · 2022-12-11 16:56:50 -04:00 · 2022-12-11 16:55:52 -04:00
2 changed files with 2 additions and 2 deletions
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@ -3,7 +3,7 @@
 version: '3'
 vars:
-  PREFIX: '{{default "/usr/local" .PREFIX}}'
+  PREFIX: '{{default (eq OS "darwin" | ternary "/usr/local" "/usr") .PREFIX}}'
  bindir__: '{{.PREFIX}}/bin'
  BINDIR: '{{default .bindir__ .BINDIR}}'
  libdir__: '{{.PREFIX}}/share/hilbish'
--- a/vars_linux.go
+++ b/vars_linux.go
@ -14,7 +14,7 @@ var (
 	.. hilbish.userDir.config	.. '/hilbish/?/init.lua;'
 	.. hilbish.userDir.config	.. '/hilbish/?/?.lua;'
 	.. hilbish.userDir.config	.. '/hilbish/?.lua'`
-	dataDir = "/usr/local/share/hilbish"
+	dataDir = "/usr/share/hilbish"
 	preloadPath = dataDir + "/nature/init.lua"
 	sampleConfPath = dataDir + "/.hilbishrc.lua" // Path to default/sample config
 	defaultConfDir = ""
Author	SHA1	Message	Date
TorchedSammy	faa8f9cf2f	build: fix check for macos	2022-12-11 17:05:06 -04:00
TorchedSammy	1f8f6aa347	chore: revert "build!: just default to /usr/local on linux and macos" This reverts commit `a9e324faa9`.	2022-12-11 16:56:50 -04:00
TorchedSammy	a23ca7423f	chore: revert "fix!: set dataDir to have /usr/local prefix" This reverts commit `b1d0cf3c78`. this is a "breaking" change not worth it honestly	2022-12-11 16:55:52 -04:00