forked from Shinonome/caelestia-cli
shell: fix log when no log rules
also fix nix devshell
This commit is contained in:
@@ -40,12 +40,7 @@
|
|||||||
|
|
||||||
devShells = forAllSystems (pkgs: {
|
devShells = forAllSystems (pkgs: {
|
||||||
default = pkgs.mkShellNoCC {
|
default = pkgs.mkShellNoCC {
|
||||||
inputsFrom = [self.packages.${pkgs.system}.caelestia-cli];
|
packages = [(self.packages.${pkgs.system}.caelestia-cli.override {withShell = true;})];
|
||||||
packages = [
|
|
||||||
(pkgs.writeShellScriptBin "caelestia" ''
|
|
||||||
cd src && python -m caelestia "$@"
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -44,7 +44,10 @@ class Command:
|
|||||||
print(self.shell("ipc", "show"), end="")
|
print(self.shell("ipc", "show"), end="")
|
||||||
|
|
||||||
def print_log(self) -> None:
|
def print_log(self) -> None:
|
||||||
log = self.shell("log", "-r", self.args.log_rules)
|
if self.args.log_rules:
|
||||||
|
log = self.shell("log", "-r", self.args.log_rules)
|
||||||
|
else:
|
||||||
|
log = self.shell("log")
|
||||||
# FIXME: remove when logging rules are added/warning is removed
|
# FIXME: remove when logging rules are added/warning is removed
|
||||||
for line in log.splitlines():
|
for line in log.splitlines():
|
||||||
if self.filter_log(line):
|
if self.filter_log(line):
|
||||||
|
|||||||
Reference in New Issue
Block a user