mirror of
				https://github.com/sammy-ette/Hilbish
				synced 2025-08-10 02:52:03 +00:00 
			
		
		
		
	fix: revert fools
This commit is contained in:
		
							parent
							
								
									57ac7bd0f6
								
							
						
					
					
						commit
						f1ebf8f5d4
					
				| @ -1,11 +1,5 @@ | ||||
| # 🎀 Changelog | ||||
| 
 | ||||
| ## [2.1.1] - 2022-04-01 | ||||
| ### Added | ||||
| - Validation checks for command input | ||||
| - Improved runtime performance | ||||
| - Validate Lua code | ||||
| 
 | ||||
| ## [2.1.0] - 2022-02-10 | ||||
| ### Added | ||||
| - Documented custom userdata types (Job and Timer Objects) | ||||
|  | ||||
							
								
								
									
										32
									
								
								exec.go
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								exec.go
									
									
									
									
									
								
							| @ -7,7 +7,6 @@ import ( | ||||
| 	"os/exec" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"math/rand" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 	"runtime" | ||||
| @ -119,11 +118,6 @@ func runInput(input string, priv bool) { | ||||
| 		// can only be a string or function so | ||||
| 		var runnerErr error | ||||
| 		input, exitCode, cont, runnerErr, err = runLuaRunner(currentRunner, input) | ||||
| 		t := time.Now() | ||||
| 		if t.Month() == 4 && t.Day() == 1 { | ||||
| 			fmt.Println("april fools") | ||||
| 		} | ||||
| 
 | ||||
| 		if err != nil { | ||||
| 			fmt.Fprintln(os.Stderr, err) | ||||
| 			cmdFinish(124, input, priv) | ||||
| @ -202,17 +196,6 @@ func runLuaRunner(runr rt.Value, userInput string) (input string, exitCode uint8 | ||||
| } | ||||
| 
 | ||||
| func handleLua(input string) (string, uint8, error) { | ||||
| 	t := time.Now() | ||||
| 	if t.Month() == 4 && t.Day() == 1 { | ||||
| 		rand.Seed(t.UnixNano()) | ||||
| 		p := rand.Intn(100-1) + 1 | ||||
| 
 | ||||
| 		if p >= 42 { | ||||
| 			time.Sleep(2 * time.Second) | ||||
| 			return input, 69, fmt.Errorf("how do i deal with this input?") | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	cmdString := aliases.Resolve(input) | ||||
| 	// First try to load input, essentially compiling to bytecode | ||||
| 	chunk, err := l.CompileAndLoadLuaChunk("", []byte(cmdString), rt.TableValue(l.GlobalEnv())) | ||||
| @ -240,27 +223,12 @@ func handleLua(input string) (string, uint8, error) { | ||||
| } | ||||
| 
 | ||||
| func handleSh(cmdString string) (input string, exitCode uint8, cont bool, runErr error) { | ||||
| 	t := time.Now() | ||||
| 	if t.Month() == 4 && t.Day() == 1 { | ||||
| 		rand.Seed(time.Now().UnixNano()) | ||||
| 		p := rand.Intn(100-1) + 1 | ||||
| 
 | ||||
| 		if p >= 42 { | ||||
| 			input = cmdString | ||||
| 			exitCode = 69 | ||||
| 			runErr = fmt.Errorf("sorry i forgot how to run commands") | ||||
| 			time.Sleep(2 * time.Second) | ||||
| 			return | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	shRunner := hshMod.Get(rt.StringValue("runner")).AsTable().Get(rt.StringValue("sh")) | ||||
| 	var err error | ||||
| 	input, exitCode, cont, runErr, err = runLuaRunner(shRunner, cmdString) | ||||
| 	if err != nil { | ||||
| 		runErr = err | ||||
| 	} | ||||
| 
 | ||||
| 	return | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -71,13 +71,6 @@ bait.catch('error', function(event, handler, err) | ||||
| end) | ||||
| 
 | ||||
| bait.catch('command.not-found', function(cmd) | ||||
| 	if os.date '%d' == '01' and os.date '%m' == '04' then | ||||
| 		print 'oopsie!!! you made a bad mistake!!! goodbye!!' | ||||
| 		hilbish.timeout(function() | ||||
| 			os.exit() | ||||
| 		end, 2000) | ||||
| 	end | ||||
| 
 | ||||
| 	print(string.format('hilbish: %s not found', cmd)) | ||||
| end) | ||||
| 
 | ||||
|  | ||||
| @ -3,10 +3,6 @@ local lunacolors = require 'lunacolors' | ||||
| 
 | ||||
| bait.catch('hilbish.init', function() | ||||
| 	if hilbish.interactive and type(hilbish.opts.greeting) == 'string' then | ||||
| 		if os.date '%d' == '01' and os.date '%m' == '04' then | ||||
| 			print('welcome to a shell, i think??') | ||||
| 		else | ||||
| 			print(lunacolors.format(hilbish.opts.greeting)) | ||||
| 		end | ||||
| 		print(lunacolors.format(hilbish.opts.greeting)) | ||||
| 	end | ||||
| end) | ||||
|  | ||||
| @ -8,10 +8,6 @@ Docs, docs, docs... At least builtins work with pipes now. | ||||
| 
 | ||||
| bait.catch('hilbish.init', function() | ||||
| 	if hilbish.interactive and hilbish.opts.motd then | ||||
| 		if os.date '%d' == '01' and os.date '%m' == '04' then | ||||
| 			print('lolololololololol\n') | ||||
| 		else | ||||
| 			print(lunacolors.format(hilbish.motd)) | ||||
| 		end | ||||
| 		print(lunacolors.format(hilbish.motd)) | ||||
| 	end | ||||
| end) | ||||
|  | ||||
							
								
								
									
										12
									
								
								util/util.go
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								util/util.go
									
									
									
									
									
								
							| @ -2,13 +2,10 @@ package util | ||||
| 
 | ||||
| import ( | ||||
| 	"bufio" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"strings" | ||||
| 	"math/rand" | ||||
| 	"os" | ||||
| 	"os/user" | ||||
| 	"time" | ||||
| 
 | ||||
| 	rt "github.com/arnodel/golua/runtime" | ||||
| ) | ||||
| @ -40,15 +37,6 @@ func DoString(rtm *rt.Runtime, code string) error { | ||||
| 
 | ||||
| // DoFile runs the contents of the file in the Lua runtime. | ||||
| func DoFile(rtm *rt.Runtime, path string) error { | ||||
| 	t := time.Now() | ||||
| 	if t.Month() == 4 && t.Day() == 1 { | ||||
| 		rand.Seed(t.UnixNano()) | ||||
| 		p := rand.Intn(100-1) + 1 | ||||
| 
 | ||||
| 		if p >= 72 { | ||||
| 			return fmt.Errorf("i dont like you or your lua code") | ||||
| 		} | ||||
| 	} | ||||
| 	f, err := os.Open(path) | ||||
| 	defer f.Close() | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user