refactor(shim): Remove CS shim codebase (#5903)

ScoopInstaller · Apr 18, 2024 · fa06e92 · fa06e92
1 parent 98cf8ae
commit fa06e92
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 279 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,6 +67,7 @@
 - **core:** Cleanup some old codes, e.g., msi section and config migration ([#5715](https://github.com/ScoopInstaller/Scoop/issues/5715), [#5824](https://github.com/ScoopInstaller/Scoop/issues/5824))
 - **core:** Rewrite and separate path-related functions to `system.ps1` ([#5836](https://github.com/ScoopInstaller/Scoop/issues/5836), [#5858](https://github.com/ScoopInstaller/Scoop/issues/5858), [#5864](https://github.com/ScoopInstaller/Scoop/issues/5864))
 - **core:** Get rid of 'fullpath' ([#3533](https://github.com/ScoopInstaller/Scoop/issues/3533))
+- **shim:** Remove CS shim codebase ([#5903](https://github.com/ScoopInstaller/Scoop/issues/5903))
 
 ### Builds
 

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -979,13 +979,12 @@ function shim($path, $global, $name, $arg) {
 }
 
 function get_shim_path() {
-    $shim_path = "$(versiondir 'scoop' 'current')\supporting\shims\kiennq\shim.exe"
-    $shim_version = get_config SHIM 'default'
-    switch ($shim_version) {
-        '71' { $shim_path = "$(versiondir 'scoop' 'current')\supporting\shims\71\shim.exe"; Break }
-        'scoopcs' { $shim_path = "$(versiondir 'scoop' 'current')\supporting\shimexe\bin\shim.exe"; Break }
-        'kiennq' { Break } # for backward compatibility
-        'default' { Break }
+    $shim_version = get_config SHIM 'kiennq'
+    $shim_path = switch ($shim_version) {
+        'scoopcs' { "$(versiondir 'scoop' 'current')\supporting\shims\scoopcs\shim.exe" }
+        '71' { "$(versiondir 'scoop' 'current')\supporting\shims\71\shim.exe" }
+        'kiennq' { "$(versiondir 'scoop' 'current')\supporting\shims\kiennq\shim.exe" }
+        'default' { "$(versiondir 'scoop' 'current')\supporting\shims\scoopcs\shim.exe" }
         default { warn "Unknown shim version: '$shim_version'" }
     }
     return $shim_path

diff --git a/supporting/shimexe/.gitignore b/supporting/shimexe/.gitignore
diff --git a/supporting/shimexe/bin/checksum.sha256 b/supporting/shimexe/bin/checksum.sha256
diff --git a/supporting/shimexe/bin/checksum.sha512 b/supporting/shimexe/bin/checksum.sha512
diff --git a/supporting/shimexe/bin/shim.exe b/supporting/shimexe/bin/shim.exe
diff --git a/supporting/shimexe/build.ps1 b/supporting/shimexe/build.ps1
diff --git a/supporting/shimexe/install.ps1 b/supporting/shimexe/install.ps1
diff --git a/supporting/shimexe/packages.config b/supporting/shimexe/packages.config
diff --git a/supporting/shimexe/shim.cs b/supporting/shimexe/shim.cs
diff --git a/supporting/shimexe/shim.csproj b/supporting/shimexe/shim.csproj
diff --git a/supporting/shimexe/update.ps1 b/supporting/shimexe/update.ps1
diff --git a/supporting/shims/scoopcs/checksum.sha256 b/supporting/shims/scoopcs/checksum.sha256
@@ -0,0 +1 @@
+0116068768fc992fc536738396b33db3dafe6b0cf0e6f54f6d1aa8b0331f3cec *shim.exe
diff --git a/supporting/shims/scoopcs/checksum.sha512 b/supporting/shims/scoopcs/checksum.sha512
@@ -0,0 +1 @@
+d734c528e9f20581ed3c7aa71a458f7dff7e2780fa0c319ccb9c813cd8dbf656bd7e550b81d2aa3ee8775bff9a4e507bc0b25f075697405adca0f47d37835848 *shim.exe
diff --git a/supporting/shims/scoopcs/shim.exe b/supporting/shims/scoopcs/shim.exe
diff --git a/supporting/shims/scoopcs/version.txt b/supporting/shims/scoopcs/version.txt
@@ -0,0 +1 @@
+1.1.0
diff --git a/test/Scoop-00File.Tests.ps1 b/test/Scoop-00File.Tests.ps1
@@ -7,8 +7,7 @@ BeforeDiscovery {
         '[\\/]\.git[\\/]',
         '\.sublime-workspace$',
         '\.DS_Store$',
-        'supporting(\\|/)validator(\\|/)packages(\\|/)*',
-        'supporting(\\|/)shimexe(\\|/)packages(\\|/)*'
+        'supporting(\\|/)validator(\\|/)packages(\\|/)*'
     )
     $repo_files = (Get-ChildItem $TestPath -File -Recurse).FullName |
         Where-Object { $_ -inotmatch $($project_file_exclusions -join '|') }