From 7e929f54378e68374a6962773fbbd3fc3c8d6e33 Mon Sep 17 00:00:00 2001
From: Oren Rozen <countoren@gmail.com>
Date: Sun, 2 Feb 2020 16:25:57 -0500
Subject: change vscodeSettingsFile parameter type from path to string

---
 pkgs/misc/vscode-extensions/updateSettings.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'pkgs/misc')

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}''
   ))
-- 
cgit 1.4.1