CHANGELOG.md

@@ -1,16 +1,9 @@
 # 🎀 Changelog
 
 ## Unreleased
-**NOTES FOR USERS/PACKAGERS UPDATING:**
+**NOTE:** Hilbish now uses [Task] insead of Make for builds.
-- Hilbish now uses [Task] insead of Make for builds.
+Windows support is also now at a lower tier; The only thing guaranteed is
-- The doc format has been changed from plain text to markdown.
+Hilbish *compiling* on Windows.
-**YOU MUST reinstall Hilbish to remove the duplicate, old docs.**
-- Hilbish will by default install to **`/usr/local`** instead of just `/usr/`
-when building via Task. This is mainly to avoid conflict of distro packages
-and local installs, and is the correct place when building from git either way.
-To keep Hilbish in `/usr`, you must have `PREFIX="/usr/"` when running `task build` or `task install`
-- Windows is no longer supported. It will build and run, but **will** have problems.
-If you want to help fix the situation, start a discussion or open an issue and contribute.
 
 [Task]: https://taskfile.dev/#/
 

README.md

@@ -69,7 +69,8 @@ If you're new to nix you should probably read up on how to do that [here](https:
 ## Manual Build
 ### Prerequisites
 - [Go 1.17+](https://go.dev)
-- [Task](https://taskfile.dev/installation/) (**Go on the hyperlink here to see Task's install method for your OS.**)
+- [Task](https://taskfile.dev/#/) 
+	- **Do go to the link here for the installation of Task. Too much people install taskwarrior, which is the wrong program**
 
 ### Build
 First, clone Hilbish. The recursive is required, as some Lua libraries

Taskfile.yaml

@@ -3,19 +3,19 @@
 version: '3'
 
 vars:
-  PREFIX: '{{default "/usr/local" .PREFIX}}'
+  PREFIX: '{{default "/usr" .PREFIX}}'
   bindir__: '{{.PREFIX}}/bin'
   BINDIR: '{{default .bindir__ .BINDIR}}'
   libdir__: '{{.PREFIX}}/share/hilbish'
   LIBDIR: '{{default .libdir__ .LIBDIR}}'
-  GOFLAGS: '-ldflags "-s -w -X main.dataDir={{.LIBDIR}}"'
+  GOFLAGS: '-ldflags "-s -w"'
 
 tasks:
   default:
     cmds:
       - CGO_ENABLED=0 go build {{.GOFLAGS}}
     vars:
-      GOFLAGS: '-ldflags "-s -w -X main.dataDir={{.LIBDIR}} -X main.gitCommit=$(git rev-parse --short HEAD) -X main.gitBranch=$(git rev-parse --abbrev-ref HEAD)"'
+      GOFLAGS: '-ldflags "-s -w -X main.gitCommit=$(git rev-parse --short HEAD) -X main.gitBranch=$(git rev-parse --abbrev-ref HEAD)"'
 
   build:
     cmds:

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 = ""