fix(versions): Get current version from failed installation if possib…

…le (ScoopInstaller#4720)
CyberFlameGO · Feb 9, 2022 · ba970d5 · ba970d5
1 parent e450843
commit ba970d5
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - **shim:** Fix PS1 shim error when in different drive in PS7 ([#4614](https://github.com/ScoopInstaller/Scoop/issues/4614))
 - **shim:** Fix `sh` shim error in WSL ([#4637](https://github.com/ScoopInstaller/Scoop/issues/4637))
 - **versions:** Fix wrong version number when only one version dir ([#4679](https://github.com/ScoopInstaller/Scoop/issues/4679))
+- **versions:** Get current version from failed installation if possible ([#4720](https://github.com/ScoopInstaller/Scoop/issues/4720))
 - **scoop-cleanup:** Remove apps other than current version ([#4665](https://github.com/ScoopInstaller/Scoop/issues/4665))
 - **scoop-update:** Skip updating non git buckets ([#4670](https://github.com/ScoopInstaller/Scoop/issues/4670))
   - **scoop-update:** Remove 'Done.' output ([#4672](https://github.com/ScoopInstaller/Scoop/issues/4672))

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -210,7 +210,10 @@ function installed_apps($global) {
 
 # check whether the app failed to install
 function failed($app, $global) {
-    return (is_directory (appdir $app $global)) -and !(Select-CurrentVersion -AppName $app -Global:$global)
+    $app = ($app -split '/|\\')[-1]
+    $appPath = appdir $app $global
+    $hasCurrent = (get_config NO_JUNCTIONS) -or (Test-Path "$appPath\current")
+    return (Test-Path $appPath) -and !($hasCurrent -and (installed $app $global))
 }
 
 function file_path($app, $file) {

diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -1077,12 +1077,19 @@ function prune_installed($apps, $global) {
     return @($uninstalled), @($installed)
 }
 
-function ensure_none_failed($apps, $global) {
+function ensure_none_failed($apps) {
     foreach ($app in $apps) {
         $app = ($app -split '/|\\')[-1] -replace '\.json$', ''
-        if (failed $app $global) {
-            warn "Purging previous failed installation of $app."
-            & "$PSScriptRoot\..\libexec\scoop-uninstall.ps1" $app$(if ($global) { ' --global' })
+        foreach ($global in $true, $false) {
+            if (failed $app $global) {
+                if (installed $app $global) {
+                    warn "Repair previous failed installation of $app."
+                    & "$PSScriptRoot\..\libexec\scoop-reset.ps1" $app$(if ($global) { ' --global' })
+                } else {
+                    warn "Purging previous failed installation of $app."
+                    & "$PSScriptRoot\..\libexec\scoop-uninstall.ps1" $app$(if ($global) { ' --global' })
+                }
+            }
         }
     }
 }

diff --git a/lib/versions.ps1 b/lib/versions.ps1
@@ -50,19 +50,20 @@ function Select-CurrentVersion {
         $Global
     )
     process {
-        $appPath = appdir $AppName $Global
-        if (get_config NO_JUNCTIONS) {
+        $currentPath = "$(appdir $AppName $Global)\current"
+        if (!(get_config NO_JUNCTIONS)) {
+            $currentVersion = (parse_json "$currentPath\manifest.json").version
+            if ($currentVersion -eq 'nightly') {
+                $currentVersion = (Get-Item $currentPath).Target | Split-Path -Leaf
+            }
+        }
+        if ($null -eq $currentVersion) {
             $installedVersion = Get-InstalledVersion -AppName $AppName -Global:$Global
             if ($installedVersion) {
                 $currentVersion = @($installedVersion)[-1]
             } else {
                 $currentVersion = $null
             }
-        } else {
-            $currentVersion = (installed_manifest $AppName 'current' $Global).version
-            if ($currentVersion -eq 'nightly') {
-                $currentVersion = (Get-Item "$appPath\current").Target | Split-Path -Leaf
-            }
         }
         return $currentVersion
     }

diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1
@@ -59,6 +59,8 @@ if (is_scoop_outdated) {
     }
 }
 
+ensure_none_failed $apps
+
 if ($apps.length -eq 1) {
     $app, $null, $version = parse_app $apps
     if ($app.EndsWith('.json')) {
@@ -102,7 +104,7 @@ $explicit_apps = $apps
 if (!$independent) {
     $apps = $apps | Get-Dependency -Architecture $architecture | Select-Object -Unique # adds dependencies
 }
-ensure_none_failed $apps $global
+ensure_none_failed $apps
 
 $apps, $skip = prune_installed $apps $global
 

diff --git a/libexec/scoop-list.ps1 b/libexec/scoop-list.ps1
@@ -44,7 +44,7 @@ $apps | Where-Object { !$query -or ($_.name -match $query) } | ForEach-Object {
 
     $info = @()
     if($global) { $info += "Global install" }
-    if (!$install_info) { $info += "Install failed" }
+    if (failed $app $global) { $info += "Install failed" }
     if ($install_info.hold) { $info += "Held package" }
     if ($install_info.architecture -and $def_arch -ne $install_info.architecture) {
         $info += $install_info.architecture

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -274,8 +274,9 @@ function update($app, $global, $quiet = $false, $independent, $suggested, $use_c
         install_app $app $architecture $global $suggested $use_cache $check_hash
     } else {
         # Also add missing dependencies
-        $apps = Get-Dependency $app $architecture | Where-Object { !(installed $_) }
-        $apps | ForEach-Object { install_app $_ $architecture $global $suggested $use_cache $check_hash }
+        $apps = (Get-Dependency $app $architecture) -ne $app
+        ensure_none_failed $apps
+        @($apps) + $app | Where-Object { !(installed $_) } | ForEach-Object { install_app $_ $architecture $global $suggested $use_cache $check_hash }
     }
 }
 
@@ -311,14 +312,15 @@ if (-not ($apps -or $all)) {
             ($app, $global) = $_
             $status = app_status $app $global
             if ($status.installed -and ($force -or $status.outdated)) {
-                if(!$status.hold) {
+                if (!$status.hold) {
                     $outdated += applist $app $global
-                    Write-Host -f yellow ("$app`: $($status.version) -> $($status.latest_version){0}" -f ('',' (global)')[$global])
+                    Write-Host -f yellow ("$app`: $($status.version) -> $($status.latest_version){0}" -f ('', ' (global)')[$global])
                 } else {
                     warn "'$app' is held to version $($status.version)"
                 }
             } elseif ($apps_param -ne '*') {
                 if ($status.installed) {
+                    ensure_none_failed $app $global
                     Write-Host "$app`: $($status.version) (latest version)" -ForegroundColor Green
                 } else {
                     info 'Please reinstall it or fix the manifest.'