Universal Blue•2y ago•

108 replies

feat(just): Add tab completion to ujust ...

@bsherman does this look right?
https://github.com/ublue-os/config/commit/d0522240cb5e4488d3a0b01d0478f7372fe46b69

GitHub

feat(just): Add tab completion to ujust · ublue-os/config@d052224

bsherman•1/10/24, 4:54 PM

threading

bsherman•1/10/24, 4:54 PM

i don't think that will work as epxected

bsherman•1/10/24, 4:55 PM

so, you made that edit in the

%build

%build

scriptlet... everything that happens there, if you want it to be in the RPM, needs to end up in the buildroot,

M2•1/10/24, 4:55 PM

also the completion for just is looking only if the called command was just

MM2 also the completion for just is looking only if the called command was just

bsherman•1/10/24, 4:56 PM

does that mean the symlink idea is not valid? i've not done much with completions, so apologies if i sent us down a rabbit trail

bsherman•1/10/24, 4:57 PM

honestly, before building this stuff into RPMs it's a lot easier to test... i usually do a lot of local testing before i get to packaging/pushing commits...

M2•1/10/24, 4:57 PM

_just() {
    local i cur prev opts cmds
    COMPREPLY=()
    cur="${COMP_WORDS[COMP_CWORD]}"
    prev="${COMP_WORDS[COMP_CWORD-1]}"
    cmd=""
    opts=""

    for i in ${COMP_WORDS[@]}
    do
        case "${i}" in
            "$1")
                cmd="just"
                ;;
            
            *)
                ;;
        esac
    done

    case "${cmd}" in
        just)

_just() {
    local i cur prev opts cmds
    COMPREPLY=()
    cur="${COMP_WORDS[COMP_CWORD]}"
    prev="${COMP_WORDS[COMP_CWORD-1]}"
    cmd=""
    opts=""

    for i in ${COMP_WORDS[@]}
    do
        case "${i}" in
            "$1")
                cmd="just"
                ;;
            
            *)
                ;;
        esac
    done

    case "${cmd}" in
        just)

Is the logic to get into just completion

HikariKnightOP•1/10/24, 4:58 PM

if i need to edit that i can do that using perl, just show me what needs to be changed and i can process that

HikariKnightOP•1/10/24, 4:58 PM

or i can just to a

s/just/ujust/g

s/just/ujust/g

bsherman•1/10/24, 4:59 PM

like for this...

if not wanting to risk you desktop system...

have a ublue/Silverblue VM, and

chattr -i /

chattr -i /

on it and then just do the symlink normal to test

HikariKnightOP•1/10/24, 4:59 PM

havent set up the vm yet

HikariKnightOP•1/10/24, 5:00 PM

since i would end up setting up a VM with actual hardware passed through to it for better testing

MM2 ``` _just() { local i cur prev opts cmds COMPREPLY=() cur="${COMP_WO...

bsherman•1/10/24, 5:00 PM

so you propose to append that to

bash-completion/completions/just

bash-completion/completions/just

not add a new file?

M2•1/10/24, 5:00 PM

ujust-completion4.72KB

M2•1/10/24, 5:00 PM

Here you go

HHikariKnight since i would end up setting up a VM with actual hardware passed through to it f...

bsherman•1/10/24, 5:01 PM

"real" hardware is overated

the main benefit is testing 3D hardware, etc, specific hardware driver support, and your personal machine will only have so much of that anyway

HikariKnightOP•1/10/24, 5:02 PM

seems to be just

s/just/ujust/g

s/just/ujust/g

so i can programmatically do that and pipe the output to the file

M2•1/10/24, 5:03 PM

yeah just don't change where it's a justfile

HikariKnightOP•1/10/24, 5:05 PM

that shouldnt be a problem

HHikariKnight seems to be just `s/just/ujust/g` so i can programmatically do that and pipe the...

bsherman•1/10/24, 5:05 PM

yeah, i think simply add the

ujust-completion

ujust-completion

file to the config repo , as provided by @M2 and make sure it gets included in the RPM

HikariKnightOP•1/10/24, 5:05 PM

can look into auto generating it later then

HHikariKnight can look into auto generating it later then

bsherman•1/10/24, 5:10 PM

auto generating what?

HikariKnightOP•1/10/24, 5:11 PM

as in just have the rpm just grab the content of the just completion, parse it and modify it for ujust instead of supplying a hardcoded one

HikariKnightOP•1/10/24, 5:12 PM

i... tend to over engineer things sometimes

HHikariKnight i... tend to over engineer things sometimes 😅

bsherman•1/10/24, 5:13 PM

well, i think what M2 provided lets bash use the

just

just

completion when called as

ujust

ujust

so there's not a need to do more

HikariKnightOP•1/10/24, 5:18 PM

https://github.com/ublue-os/config/commit/89df9c060a6bb339ad1bb67d4d0c35892c2912e4
that should work now

GitHub

feat(just): Add tab completion to ujust with help from M2 and bsher...

HikariKnightOP•1/10/24, 5:30 PM

hmm cant see what i am missing in the spec file, it says it cannot find ujust-completion

https://github.com/ublue-os/config/pull/188

GitHub

feat(just): Add tab completion to ujust with help from M2 and bsher...

Addresses #187

HHikariKnight hmm cant see what i am missing in the spec file, it says it cannot find ujust-co...

bsherman•1/10/24, 5:33 PM

you'll need to add a line similar to these: https://github.com/ublue-os/config/blob/main/build/ublue-os-just/build.sh#L9-L12

HikariKnightOP•1/10/24, 5:34 PM

oh right i forgot the build script

bsherman•1/10/24, 5:34 PM

everything with RPM spec is about staging stuff in the builddir before starting

HikariKnightOP•1/10/24, 5:36 PM

im so used to making launchpad deb packages where you just specify where it goes and done

HikariKnightOP•1/10/24, 5:37 PM

ok its done and pushed

bsherman•1/10/24, 5:37 PM

i haven't done launchpad, and it's been a long time since i built a deb from scratch... but i will say, i think we could probably simplify some of this process, but i didn't create it all so i haven't dove into a refactor yet

HikariKnightOP•1/10/24, 5:40 PM

i recently did a refactor of quickpassthrough from bash to golang

HikariKnightOP•1/10/24, 5:41 PM

it took me a year (with irl distractions)
actual coding time maybe 3 weeks to a month

HikariKnightOP•1/10/24, 5:41 PM

2023 was rough for me to say the least

bsherman•1/10/24, 5:42 PM

btw, i did misunderstand something with what M2 wrote above.,.. when i saw the code-snippet, i assumed that the attached file was only that, and it was some magic to tie into the

just

just

completion file...

but i realize i was wrong, and what you said about automating, @HikariKnight does make sense now.

HikariKnightOP•1/10/24, 5:43 PM

yeah but i dont know if rpm can execute just at install to run the completion command

bsherman•1/10/24, 5:44 PM

it probably can't execut

just

just

but it can certainly:

s/just/ujust/g
s/just/ujust/g
so i can programmatically do that and pipe the output to the file

HikariKnightOP•1/10/24, 5:45 PM

well just generates the file using

just --completions bash

just --completions bash

HikariKnightOP•1/10/24, 5:45 PM

and i could just pipe the output to perl and modify it on the fly before writing it

bsherman•1/10/24, 5:45 PM

ahhhhh i'm tracking with you now

bsherman•1/10/24, 5:46 PM

hmm...

HikariKnightOP•1/10/24, 5:48 PM

i know with debs you can run post install commands to do stuff like that

bsherman•1/10/24, 5:48 PM

in the

build.sh

build.sh

, we could install just into the build container, then you can sed 's/just/ujust/g' /usr/share/bash-completion/completions/just > /tmp/ublue-os/rpmbuild/SOURCES/ujust-completionsed 's/just/ujust/g' /usr/share/bash-completion/completions/just > /tmp/ublue-os/rpmbuild/SOURCES/ujust-completion instead of the

cp

cp

bsherman•1/10/24, 5:49 PM

you can do

%post

%post

stuff in RPM also, so that's another option, though we'd need to ensure that

ublue-os-just

ublue-os-just

requires that

just

just

is installed first

HikariKnightOP•1/10/24, 5:50 PM

think it already says that in the spec file

HikariKnightOP•1/10/24, 5:50 PM

Supplements: just

bsherman•1/10/24, 5:52 PM

yeah, I'd have to lookup the keyword

bsherman•1/10/24, 5:53 PM

I think Supplements is technicall a weak dependency, and we'd really prefer a hard dependency, since we'd be using

just

just

in our

%post

%post

_just() { local i cur prev opts cmds COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" cmd="" opts="" for i in ${COMP_WORDS[@]} do case "${i}" in "$1") cmd="just" ;; *) ;; esac done case "${cmd}" in just)

feat(just): Add tab completion to ujust ...

Similar Threads

Similar Threads

Similar Threads