diff options
| author | nzbr <mail@nzbr.de> | 2023-01-18 13:07:29 +0100 |
|---|---|---|
| committer | nzbr <mail@nzbr.de> | 2023-01-18 13:07:29 +0100 |
| commit | 016b23cf6df28aa2df7b9b222bf1be3709d82958 (patch) | |
| tree | 2cda760bb3373fe58eb87020398c456be85cab0f /modules | |
| parent | deedbba8538180809d290e7c3f98607f91468e19 (diff) | |
| parent | 217178edb1127fb41ac4fd534d8a513c3dd3d81b (diff) | |
Merge branch 'main' into version
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/wsl-distro.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix index 0316c77..e75e7f0 100644 --- a/modules/wsl-distro.nix +++ b/modules/wsl-distro.nix @@ -88,9 +88,13 @@ with lib; { copy-launchers = mkIf cfg.startMenuLaunchers ( stringAfter [ ] '' for x in applications icons; do - echo "Copying /usr/share/$x" - mkdir -p /usr/share/$x - ${pkgs.rsync}/bin/rsync -ar --delete $systemConfig/sw/share/$x/. /usr/share/$x + echo "setting up /usr/share/''${x}..." + if [[ -d $systemConfig/sw/share/$x ]]; then + mkdir -p /usr/share/$x + ${pkgs.rsync}/bin/rsync -ar --delete $systemConfig/sw/share/$x/. /usr/share/$x + else + rm -rf /usr/share/$x + fi done '' ); @@ -170,9 +174,9 @@ with lib; { # preserve $PATH from parent variables.PATH = [ "$PATH" ]; extraInit = '' - export WSLPATH=$(echo "$PATH" | tr ':' '\n' | grep -E "^${cfg.wslConf.automount.root}" | tr '\n' ':') + export WSLPATH=$(echo "$PATH" | tr ':' '\0' | command grep -a "^${cfg.wslConf.automount.root}" | tr '\0' ':') ${if cfg.interop.includePath then "" else '' - export PATH=$(echo "$PATH" | tr ':' '\n' | grep -vE "^${cfg.wslConf.automount.root}" | tr '\n' ':') + export PATH=$(echo "$PATH" | tr ':' '\0' | command grep -av "^${cfg.wslConf.automount.root}" | tr '\0' ':') ''} ''; }; |