sysdig: fix bash-completion location #105684
Conversation
In order to support auto-loading, the bash-completion scripts should live in $out/share/bash-completion.
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 11-100
labels
|
Result of 1 package marked as broken and skipped:
|
|
Result of 4 packages marked as broken and skipped:
16 packages built:
|
| '' | ||
| # Fix the bash completion location | ||
| installShellCompletion --bash $out/etc/bash_completion.d/sysdig | ||
| rm $out/etc/bash_completion.d/sysdig |
There was a problem hiding this comment.
We can't use rm -rf here, right?
There was a problem hiding this comment.
I think this is a check that exactly one file is removed (and some directories), which makes sense for something as generic as $out/etc
There was a problem hiding this comment.
Yes, that was the purpose. If a new file gets added in future releases, we want to know about it.
| make install_driver | ||
| kernel_dev=${kernel.dev} | ||
| kernel_dev=''${kernel_dev#/nix/store/} | ||
| kernel_dev=''${kernel_dev%%-linux*dev*} |
There was a problem hiding this comment.
Isn't it enough to ${kernel_dev%%-*}?
There was a problem hiding this comment.
Maybe. This PR just indents that code so I think it's out of scope.
There was a problem hiding this comment.
Ah indeed, I do not read the red lines attentively most of the time.
| kernel_dev=''${kernel_dev#/nix/store/} | ||
| kernel_dev=''${kernel_dev%%-linux*dev*} | ||
| if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then | ||
| sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko |
There was a problem hiding this comment.
The line of dots is intended to be actually equal to ${kernel_dev//?/.}, right?
There was a problem hiding this comment.
Same as #105684 (comment)
Motivation for this change
In order to support auto-loading, the bash-completion scripts should
live in $out/share/bash-completion.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)