added pronounce snippet from #152 and macOS compatibility from #149#158
added pronounce snippet from #152 and macOS compatibility from #149#158bugswriter merged 8 commits intobugswriter:purert-versionfrom PureArtistry:purert-version
Conversation
|
Yo, tuxi is broken for me. On bash it just crashes.
On dash On zsh |
|
ahem - this will teach me to just push without testing, give me a minute sorry i just copy pasted the macOS bit, including it's bashisms |
|
sorry about that, you wouldn't mind trying again (sorry about wasting your time the first time) |
it's okay, ((bro?)) I love testing it, seriously Yep, it's working. Strangely the macOS PR to main is working fine. |
|
that's why I just c/p it without testing, assumed it would work fine. I'll try debugging it tomorrow |
|
are you getting any double answers and what's the speed like compared to main now? |
|
@PureArtistry I'm sorry, I was eating, I'm back now. |
no need to apologise for me, no need to rush either :) |
As you know, the speed depends on the type of query, but it seems on both (
|
|
I haven't done any testing really as to where stuff should be in the priority, I just copied the order from main |
|
have you tried the updated test script in test/tuxiqualitytest.sh |
|
Back again, now my computer had problems, incredible. You're responding really fast so I want to, too lol
Nah, it seems that the bottom (
Testing right now. Oh, if we try to call How many End runs there is? On the first 17 failed. |
|
yeah, I haven't hardcoded any paths, just using the working dir and assume you're running it from there |
|
Ok, it seems that I scrapped google so many times that it doesn't give me any results anymore from any tuxi, lol
|
|
wow, google is rejecting your queries!?! that seems wierd - I've never had that |
|
Yep, I debugged it and the HTML page is blank, I've had that before when fixing bugs in tuxi. Wew, it normally works after a few hours :\ <HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
<TITLE>302 Moved</TITLE></HEAD><BODY>
<H1>302 Moved</H1>
The document has moved
<A HREF="https://www.google.com/sorry/index?continue=https://www.google.com/search%3Fhl%3Den_us%26q%3D4%252B5%252B6&hl=en_us&q=EhAoBAFMZeSc_H8cH4tpSgjiGKzs74EGIhkA8aeDS6G5rZIjkLmlp9yEgPiNM48bbAt8MgFy">here</A>.
</BODY></HTML>I can't help you anymore then for those hours |
|
that's cool mate, thanks for all you are doing anyway and as I said before - there's no rush for me. I'm probably not going to be looking at any code until tomorrow anyway, got lots of dota to catch up on |
…on linux, can't test on mac but it should work in theory)
|
strange... it stopped. Anyway, for macOS compatibility, you'll really need to do all that? Renaming sed & paste will definitely confuse future developers; Can this work instead? [ "$OSTYPE" = "darwin" ] && gsed "$@" && sed "$@"
[ "$OSTYPE" = "darwin" ] && gpaste "$@" && paste "$@" |
|
you can't do it as a function similar to the original pr because that is what causes the recursion and seg fault as the sed command in the script runs the sed function that runs a sed command that runs the function etc... (this will work fine on the mac however as sed will run gsed) there probably is a better way of doing it (I am still very much a novice) but I can't think of one right now that doesn't either involve renaming sed the way I have done or having every snippet have 2 versions, one each for mac and linux. |
|
Hmm, that there is working in your branch for me in dash, bash and zsh. Can you test it? |
|
I legit don't understand exactly what the snippet you posted does or where in the script I should put it, I'm gonna need your help with this one |
|
Replace the macOS function that you had with those two lines. It probably can be simplified to one-line, but just try this one. |
|
cool, that works - I now need to do some reading I suppose to figure out how, those lines still make no sense to me |
# verify if it's macOS & true? use gpaste & false? use paste
[ "$OSTYPE" = "darwin" ] && gpaste "$@" && paste "$@"``` |
|
the false bit is confusing me, && and not ||, and not just that but how it works in general (I know I'm not articulating this well) I'm going to need to do some reading on that, figure out what it's doing. Thanks, I've sort of half learned something today |
|
I'm dumb, I'm dumb, stop aaaaaaaaaa this wont work properly, actually |
|
? |
|
I just realized now, I'm so dumb, gsed won't be called |
|
I am going to resolve this properly, my bad for the trouble!! |
|
thought of a fix myself before reading the comments again, sorry! (it's a bit of a shame as I really quite liked the word play in the hacky fix) |
|
ok, back |
|
we almost thought the same thing, I tried to rename the sed builtin for gsed, but that just didn't work, so I tried calling sed with hardpath, you used whereis and I used which actually, it does |
|
I can't test my newest fix but I think it should be fine, the one before that deffo would have worked but it was 3 times slower because it would have to run both whereis and awk before it run sed every single time I am still going to have to read up on what you suggested does and how it works |
yes, I tried with only which, but it's slower than just calling it directly
The last one is working fine
ehhh, it doesn't, unfortunately, but it's good learning that to avoid using ifs and elses in future shell scripts. |
|
I think I may have finally cracked how to send terminal escapes through sed so I can redo my did you mean bit and tidy some more code up yep, I have - I'll update in about 30 minutes. |
|
I am merging this many people are sending PR for new features in main. They don't know I am about to replace main with your version. |
|
give me a few minutes, I'm about to send another pr with an updated did you mean that no longer needs sd - almost finished |
3 participants
now feature compatible with main, just needs some testing