about summary refs log tree commit diff
path: root/pkgs/misc/vscode-extensions
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2021-01-24 09:19:10 +0000
committerBen Siraphob <bensiraphob@gmail.com>2021-01-24 19:56:59 +0700
commitbc0d605cf19cef46ad2c82b4d2bb931a96b7c275 (patch)
treee2748f2e13e2d7c5f0748974c666c2b1e11aec7f /pkgs/misc/vscode-extensions
parent513a3ea66508726937f65c257c79edd67059cef6 (diff)
downloadnixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar.gz
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar.bz2
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar.lz
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar.xz
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.tar.zst
nixlib-bc0d605cf19cef46ad2c82b4d2bb931a96b7c275.zip
treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
Diffstat (limited to 'pkgs/misc/vscode-extensions')
-rw-r--r--pkgs/misc/vscode-extensions/vscodeExts2nix.nix4
-rw-r--r--pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix12
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
index 58ad5866c935..58cbe663c901 100644
--- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
+++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix
@@ -18,7 +18,7 @@ writeShellScriptBin "vscodeExts2nix" ''
 
   for line in $(${vscode}/bin/code --list-extensions --show-versions \
     ${lib.optionalString (extensionsToIgnore != []) ''
-      | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)'
+      | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)'
     ''}
   ) ; do
     [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]]
@@ -26,7 +26,7 @@ writeShellScriptBin "vscodeExts2nix" ''
     publisher=''${BASH_REMATCH[1]}
     version=''${BASH_REMATCH[3]}
 
-    extensions="${lib.concatMapStringsSep "." (e : ''${e.publisher}${e.name}@${e.sha256}'') extensions}"
+    extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}"
     reCurrentExt=$publisher$name"@([^.]*)"
     if [[ $extensions =~ $reCurrentExt ]]; then
       sha256=''${BASH_REMATCH[1]}
diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
index e20c631f8c03..39479d7c2f2c 100644
--- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
+++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix
@@ -18,22 +18,22 @@ let
   mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions;
   mutableExtsPaths = lib.forEach mutExtsDrvs ( e:
   {
-    origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}'';
-    target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
+    origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}";
+    target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}'';
   }
   );
 
   #removed not defined extensions
   rmExtensions =  lib.optionalString (nixExtensions++mutableExtensions != []) ''
     find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${
-        lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name} '') nixExtensions
+        lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions
         +
-        lib.concatMapStringsSep " " (e : ''! -iname ${e.publisher}.${e.name}-${e.version} '') mutableExtensions
+        lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions
       } -exec rm -rf {} \;
   '';
   #copy mutable extension out of the nix store
   cpExtensions = ''
-    ${lib.concatMapStringsSep "\n" (e : ''ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/'') nixExtsDrvs}
+    ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs}
     ${lib.concatMapStringsSep "\n" (ePath : ''
       if [ ! -d ${ePath.target} ]; then
         cp -a ${ePath.origin} ${ePath.target}
@@ -49,6 +49,6 @@ in
       ${cpExtensions}
     fi
     ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${
-      lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }''
+      lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}"
       } "$@"
   ''