Merge a24bca3258 into ac7c97442e

chore: bump for bugfix release
chore: revert "chore: add 2.4 motd (work in progress)"
2024-11-22 16:56:43 -06:00 · 2024-11-04 06:54:09 -04:00 · 2024-11-04 06:51:31 -04:00 · 2024-11-04 06:51:20 -04:00 · 2024-11-03 23:24:32 -04:00 · 2024-11-03 23:24:18 -04:00
7 changed files with 22 additions and 38 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,6 @@
 # 🎀 Changelog

-## Unreleased
+## [2.3.3] - 2024-11-04
 ### Fixed
 - Heredocs having issues

@ -780,7 +780,8 @@ This input for example will prompt for more input to complete:

 First "stable" release of Hilbish.

-[2.3.1]: https://github.com/Rosettea/Hilbish/compare/v2.3.1...v2.3.2
+[2.3.3]: https://github.com/Rosettea/Hilbish/compare/v2.3.2...v2.3.3
+[2.3.2]: https://github.com/Rosettea/Hilbish/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/Rosettea/Hilbish/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/Rosettea/Hilbish/compare/v2.2.3...v2.3.0
 [2.2.3]: https://github.com/Rosettea/Hilbish/compare/v2.2.2...v2.2.3
--- a/go.mod
+++ b/go.mod
@ -34,4 +34,4 @@ replace github.com/maxlandon/readline => ./readline

 replace layeh.com/gopher-luar => github.com/layeh/gopher-luar v1.0.10

-replace github.com/arnodel/golua => github.com/Rosettea/golua v0.0.0-20240427174124-d239074c1749
+replace github.com/arnodel/golua => github.com/Rosettea/golua v0.0.0-20241104031959-5551ea280f23
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,5 @@
-github.com/Rosettea/golua v0.0.0-20240427174124-d239074c1749 h1:jIFnWBTsYw8s7RX7H2AOXjDVhWP3ol7OzUVaPN2KnGI=
-github.com/Rosettea/golua v0.0.0-20240427174124-d239074c1749/go.mod h1:9jzpYPiU2is0HVGCiuIOBSXdergHUW44IEjmuN1UrIE=
+github.com/Rosettea/golua v0.0.0-20241104031959-5551ea280f23 h1:mUZnT0gmDEmTkqXsbnDbuJ3CNil7DCOMiCQYgjbKIdI=
+github.com/Rosettea/golua v0.0.0-20241104031959-5551ea280f23/go.mod h1:9jzpYPiU2is0HVGCiuIOBSXdergHUW44IEjmuN1UrIE=
 github.com/Rosettea/sh/v3 v3.4.0-0.dev.0.20240815163633-562273e09b73 h1:zTTUJqNnrF2qf4LgygN8Oae5Uxn6ewH0hA8jyTCHfXw=
 github.com/Rosettea/sh/v3 v3.4.0-0.dev.0.20240815163633-562273e09b73/go.mod h1:YZalN5H7WNQw3DGij6IvHsEhn5YMW7M2FCwG6gnfKy4=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
--- a/nature/env.lua
+++ b/nature/env.lua
@ -0,0 +1,10 @@
+env = {}
+
+setmetatable(env, {
+	__index = function(_, k)
+		return os.getenv(k)
+	end,
+	__newindex = function(_, k, v)
+		os.setenv(k, tostring(v))
+	end
+})
--- a/nature/init.lua
+++ b/nature/init.lua
@ -24,6 +24,7 @@ require 'nature.opts'
 require 'nature.vim'
 require 'nature.runner'
 require 'nature.hummingbird'
+require 'nature.env'

 local shlvl = tonumber(os.getenv 'SHLVL')
 if shlvl ~= nil then
@ -32,36 +33,6 @@ else
 	os.setenv('SHLVL', '0')
 end

-do
-	local virt_G = { }
-
-	setmetatable(_G, {
-		__index = function (_, key)
-			local got_virt = virt_G[key]
-			if got_virt ~= nil then
-				return got_virt
-			end
-
-			if type(key) == 'string' then
-				virt_G[key] = os.getenv(key)
-			end
-			return virt_G[key]
-		end,
-
-		__newindex = function (_, key, value)
-			if type(value) == 'string' then
-				os.setenv(key, value)
-				virt_G[key] = value
-			else
-				if type(virt_G[key]) == 'string' then
-					os.setenv(key, '')
-				end
-				virt_G[key] = value
-			end
-		end,
-	})
-end
-
 do
 	local startSearchPath = hilbish.userDir.data .. '/hilbish/start/?/init.lua;'
 	.. hilbish.userDir.data .. '/hilbish/start/?.lua'
--- a/nature/opts/motd.lua
+++ b/nature/opts/motd.lua
@ -2,7 +2,9 @@ local bait = require 'bait'
 local lunacolors = require 'lunacolors'

 hilbish.motd = [[
-{magenta}Hilbish{reset} blooms in the {blue}midnight.{reset}
+Wait ... {magenta}2.3{reset} is basically the same as {red}2.2?{reset}
+Erm.. {blue}Ctrl-C works for Commanders,{reset} {cyan}and the sh runner has some fixes.{reset}
+Just trust me bro, this is an important bug fix release. {red}- 🌺 sammyette{reset}
 ]]

 bait.catch('hilbish.init', function()
--- a/vars.go
+++ b/vars.go
@ -11,8 +11,8 @@ var (

 // Version info
 var (
-	ver = "v2.4.0"
-	releaseName = "Moonflower"
+	ver = "v2.3.3"
+	releaseName = "Alyssum"

 	gitCommit string
 	gitBranch string
Author	SHA1	Message	Date
sammyette	527e0e0abc	Merge `a24bca3258` into `ac7c97442e`	2024-11-22 16:56:43 -06:00
sammyette	ac7c97442e	chore: bump for bugfix release	2024-11-04 06:54:09 -04:00
sammyette	7fc3f4a569	chore: revert "chore: add 2.4 motd (work in progress)" This reverts commit `e6b88816fd`.	2024-11-04 06:51:31 -04:00
sammyette	dbb45a1947	chore: revert "chore: bump to 2.4" This reverts commit `db851cf4f8`.	2024-11-04 06:51:20 -04:00
sammyette	3da150bb64	chore: merge	2024-11-03 23:24:32 -04:00
sammyette	46968e632b	fix: bump golua (closes #326 )	2024-11-03 23:24:18 -04:00
sammyette	a24bca3258	fix!: get/set env variables via env table this removes the old "virtual global table" which allows getting environment variables via just their names in lua. this means: an environment variable (like TERM) would need to be accessed via the `env` table instead of just using TERM in lua. `TERM` -> `env.TERM` they can also be set via `env.VARIABLE = 'value'	2024-05-02 22:09:04 -04:00