change vscodeSettingsFile parameter type from path to string

This commit is contained in:
Oren Rozen 2020-02-02 16:25:57 -05:00
parent 02105da596
commit 7e929f5437
1 changed files with 9 additions and 10 deletions

View File

@ -8,26 +8,25 @@
{ settings ? {} { settings ? {}
# if marked as true will create an empty json file if does not exists # if marked as true will create an empty json file if does not exists
, createIfDoesNotExists ? true , createIfDoesNotExists ? true
, vscodeSettingsFile ? .vscode/settings.json , vscodeSettingsFile ? ".vscode/settings.json"
}: }:
let let
#VSCode Settings file
vscodeSettingsFileStr = toString vscodeSettingsFile;
updateVSCodeSettingsCmd = '' updateVSCodeSettingsCmd = ''
( (
echo 'updateSettings.nix: Updating ${vscodeSettingsFileStr}...' echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...'
oldSettings=$(cat ${vscodeSettingsFileStr}) oldSettings=$(cat ${vscodeSettingsFile})
echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFileStr} echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile}
)''; )'';
createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFileStr}''; createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}'';
in in
writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (builtins.baseNameOf vscodeSettingsFileStr)}''
writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (builtins.baseNameOf vscodeSettingsFile)}''
(lib.optionalString (settings != {}) (lib.optionalString (settings != {})
(if createIfDoesNotExists then '' (if createIfDoesNotExists then ''
[ ! -f "${vscodeSettingsFileStr}" ] && ${createEmptySettingsCmd} [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd}
${updateVSCodeSettingsCmd} ${updateVSCodeSettingsCmd}
'' ''
else ''[ -f "${vscodeSettingsFileStr}" ] && ${updateVSCodeSettingsCmd}'' else ''[ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd}''
)) ))