diff options
| author | Oren Rozen <countoren@gmail.com> | 2020-02-02 16:25:57 -0500 |
|---|---|---|
| committer | Oren Rozen <countoren@gmail.com> | 2020-04-19 21:32:36 -0500 |
| commit | 7e929f54378e68374a6962773fbbd3fc3c8d6e33 (patch) | |
| tree | 5d953cf2fbb0318a85f22186db55e63342b6c99a /pkgs/misc | |
| parent | 02105da596429b365419f61f1647d711065982eb (diff) | |
| download | nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar.gz nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar.bz2 nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar.lz nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar.xz nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.tar.zst nixpkgs-7e929f54378e68374a6962773fbbd3fc3c8d6e33.zip | |
change vscodeSettingsFile parameter type from path to string
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/updateSettings.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index e3b09582ffe..7f4a817e5e8 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -8,26 +8,25 @@ { settings ? {} # if marked as true will create an empty json file if does not exists , createIfDoesNotExists ? true -, vscodeSettingsFile ? .vscode/settings.json +, vscodeSettingsFile ? ".vscode/settings.json" }: let - #VSCode Settings file - vscodeSettingsFileStr = toString vscodeSettingsFile; updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFileStr}...' - oldSettings=$(cat ${vscodeSettingsFileStr}) - echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFileStr} + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + oldSettings=$(cat ${vscodeSettingsFile}) + echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; - createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFileStr}''; + createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}''; in - writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (builtins.baseNameOf vscodeSettingsFileStr)}'' + + writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (builtins.baseNameOf vscodeSettingsFile)}'' (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' - [ ! -f "${vscodeSettingsFileStr}" ] && ${createEmptySettingsCmd} + [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} '' - else ''[ -f "${vscodeSettingsFileStr}" ] && ${updateVSCodeSettingsCmd}'' + else ''[ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd}'' )) |