From d9cce12f875f9f74ca2bb474a1e465e89a829a0b Mon Sep 17 00:00:00 2001
From: leoafarias <leoafarias@gmail.com>
Date: Tue, 14 Dec 2021 08:27:38 -0500
Subject: [PATCH] Version bump

---
 CHANGELOG.md                            |  4 ++++
 lib/src/models/cache_version_model.dart | 17 ++++++++---------
 lib/src/version.dart                    |  2 +-
 pubspec.yaml                            |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e6fcb62..f9da7574 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.6
+
+- Fixed issue with routing to older Dart SDK directory path (before 1.17.5)
+
 ## 2.2.5
 
 - Clean dart command output stdout [#361](https://github.com/leoafarias/fvm/issues/361)
diff --git a/lib/src/models/cache_version_model.dart b/lib/src/models/cache_version_model.dart
index 347d49f3..c78304fe 100644
--- a/lib/src/models/cache_version_model.dart
+++ b/lib/src/models/cache_version_model.dart
@@ -16,14 +16,7 @@ class CacheVersion {
 
   /// Get version bin path
   String get binPath {
-    /// Get old bin path
-    /// Before version 1.17.5 dart path was bin/cache/dart-sdk/bin
-
-    if (hasOldBinPath) {
-      return join(dir.path, 'bin', 'cache', 'dart-sdk', 'bin');
-    } else {
-      return join(dir.path, 'bin');
-    }
+    return join(dir.path, 'bin');
   }
 
   /// Has old dart path structure
@@ -34,7 +27,13 @@ class CacheVersion {
 
   /// Returns dart exec file for cache version
   String get dartExec {
-    return join(binPath, dartBinFileName);
+    /// Get old bin path
+    /// Before version 1.17.5 dart path was bin/cache/dart-sdk/bin
+    if (hasOldBinPath) {
+      return join(binPath, 'cache', 'dart-sdk', 'bin', dartBinFileName);
+    } else {
+      return join(binPath, dartBinFileName);
+    }
   }
 
   /// Returns flutter exec file for cache version
diff --git a/lib/src/version.dart b/lib/src/version.dart
index ebbaa609..9fdc6649 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '2.2.5';
+const packageVersion = '2.2.6';
diff --git a/pubspec.yaml b/pubspec.yaml
index 614ab85e..c7a468af 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fvm
 description: A simple cli to manage Flutter SDK versions per project. Support
   channels, releases, and local cache for fast switching between versions.
-version: 2.2.5
+version: 2.2.6
 homepage: https://github.com/leoafarias/fvm
 
 environment: