From caef3dd64c8273c8100b3450e0193b753bf83eac Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 4 Dec 2024 19:25:11 +1100 Subject: [PATCH 1/2] gui-installer: add missing double quotes for `nix-command flakes` --- pkgs/distro-packages/gui-installer/gui-installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/distro-packages/gui-installer/gui-installer.sh b/pkgs/distro-packages/gui-installer/gui-installer.sh index c222b1431..bc7f73d91 100755 --- a/pkgs/distro-packages/gui-installer/gui-installer.sh +++ b/pkgs/distro-packages/gui-installer/gui-installer.sh @@ -55,7 +55,7 @@ start_clan_gui() { exec nix run \ https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-app \ --no-accept-flake-config \ - --extra-experimental-features flakes nix-command -- "$@" + --extra-experimental-features "flakes nix-command" -- "$@" } main() { From b414b153ba7f03eef6e3be65bb9f920da04afbb3 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 4 Dec 2024 19:35:11 +1100 Subject: [PATCH 2/2] clan_cli: fix missing quotes around `nix-command flakes` Before: [$] nix \ --extra-experimental-features nix-command flakes \ show-config \ --json After: [$] nix \ --extra-experimental-features 'nix-command flakes' \ show-config \ --json --- pkgs/clan-cli/clan_cli/errors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/errors.py b/pkgs/clan-cli/clan_cli/errors.py index 0315ce75f..7b1308079 100644 --- a/pkgs/clan-cli/clan_cli/errors.py +++ b/pkgs/clan-cli/clan_cli/errors.py @@ -74,7 +74,7 @@ def indent_command(command_list: list[str]) -> str: # Indent after the next argument formatted_command.append(" ") i += 1 - formatted_command.append(command_list[i]) + formatted_command.append(shlex.quote(command_list[i])) if i < len(command_list) - 1: # Add line continuation only if it's not the last argument