Skip to content

Fixed "portable" IDE bundle detection #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2020
Merged

Fixed "portable" IDE bundle detection #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions configuration/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"

"github.com/arduino/arduino-cli/cli/feedback"
paths "github.com/arduino/go-paths-helper"
"github.com/arduino/go-win32-utils"
"github.com/sirupsen/logrus"
jww "github.com/spf13/jwalterweatherman"
Expand Down Expand Up @@ -151,7 +152,8 @@ func IsBundledInDesktopIDE() bool {
return false
}

ideDir := filepath.Dir(executablePath)
ideDir := paths.New(executablePath).Parent()
logrus.WithField("dir", ideDir).Trace("Candidate IDE directory")

// To determine if the CLI is bundled with an IDE, We check an arbitrary
// number of folders that are part of the IDE install tree
Expand All @@ -161,20 +163,21 @@ func IsBundledInDesktopIDE() bool {
}

for _, test := range tests {
if _, err := os.Stat(filepath.Join(ideDir, test)); err != nil {
if !ideDir.Join(test).Exist() {
// the test folder doesn't exist or is not accessible
return false
}
}

// the CLI is bundled in the Arduino IDE
logrus.Info("The CLI is bundled in the Arduino IDE")

// Persist IDE-related config settings
viper.Set("IDE.Bundled", true)
viper.Set("IDE.Directory", ideDir)

// Check whether this is a portable install
if _, err := os.Stat(filepath.Join(ideDir, "portable")); err != nil {
if ideDir.Join("portable").Exist() {
logrus.Info("The IDE installation is 'portable'")
viper.Set("IDE.Portable", true)
}

Expand Down