Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
arduino-cli
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Operations
Operations
Metrics
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
arduino-cli
Commits
3d5b4300
Unverified
Commit
3d5b4300
authored
Sep 29, 2021
by
Silvano Cerza
Committed by
GitHub
Sep 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip changelog] Fix lib install crash on nightlies (#1479)
parent
0a6a83c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
23 deletions
+25
-23
cli/lib/install.go
cli/lib/install.go
+3
-1
i18n/data/en.po
i18n/data/en.po
+15
-15
i18n/rice-box.go
i18n/rice-box.go
+7
-7
No files found.
cli/lib/install.go
View file @
3d5b4300
...
...
@@ -31,6 +31,7 @@ import (
rpc
"github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
"github.com/arduino/go-paths-helper"
"github.com/spf13/cobra"
semver
"go.bug.st/relaxed-semver"
)
func
initInstallCommand
()
*
cobra
.
Command
{
...
...
@@ -64,7 +65,8 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
if
installFlags
.
zipPath
||
installFlags
.
gitURL
{
if
!
configuration
.
Settings
.
GetBool
(
"library.enable_unsafe_install"
)
{
documentationURL
:=
"https://arduino.github.io/arduino-cli/latest/configuration/#configuration-keys"
if
!
strings
.
Contains
(
globals
.
VersionInfo
.
VersionString
,
"git"
)
{
_
,
err
:=
semver
.
Parse
(
globals
.
VersionInfo
.
VersionString
)
if
err
==
nil
{
split
:=
strings
.
Split
(
globals
.
VersionInfo
.
VersionString
,
"."
)
documentationURL
=
fmt
.
Sprintf
(
"https://arduino.github.io/arduino-cli/%s.%s/configuration/#configuration-keys"
,
split
[
0
],
split
[
1
])
}
...
...
i18n/data/en.po
View file @
3d5b4300
...
...
@@ -83,11 +83,11 @@ msgstr "(hidden)"
msgid "(legacy)"
msgstr "(legacy)"
#: cli/lib/install.go:7
1
#: cli/lib/install.go:7
3
msgid "--git-url and --zip-path are disabled by default, for more information see: %v"
msgstr "--git-url and --zip-path are disabled by default, for more information see: %v"
#: cli/lib/install.go:7
4
#: cli/lib/install.go:7
6
msgid "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk."
msgstr "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk."
...
...
@@ -186,7 +186,7 @@ msgid "Arduino core operations."
msgstr "Arduino core operations."
#: cli/lib/check_deps.go:50
#: cli/lib/install.go:11
7
#: cli/lib/install.go:11
9
msgid "Arguments error: %v"
msgstr "Arguments error: %v"
...
...
@@ -453,7 +453,7 @@ msgid "Couldn't determine program size"
msgstr "Couldn't determine program size"
#: cli/arguments/sketch.go:36
#: cli/lib/install.go:9
7
#: cli/lib/install.go:9
9
msgid "Couldn't get current working directory: %v"
msgstr "Couldn't get current working directory: %v"
...
...
@@ -553,7 +553,7 @@ msgstr "Disconnected"
msgid "Display only the provided gRPC calls"
msgstr "Display only the provided gRPC calls"
#: cli/lib/install.go:
49
#: cli/lib/install.go:
50
msgid "Do not install dependencies."
msgstr "Do not install dependencies."
...
...
@@ -594,11 +594,11 @@ msgstr "Downloads one or more libraries without installing them."
msgid "Enable debug logging of gRPC calls"
msgstr "Enable debug logging of gRPC calls"
#: cli/lib/install.go:5
1
#: cli/lib/install.go:5
2
msgid "Enter a path to zip file"
msgstr "Enter a path to zip file"
#: cli/lib/install.go:5
0
#: cli/lib/install.go:5
1
msgid "Enter git url for libraries hosted on repositories"
msgstr "Enter git url for libraries hosted on repositories"
...
...
@@ -789,15 +789,15 @@ msgstr "Error in FQBN: %s"
msgid "Error initializing instance: %v"
msgstr "Error initializing instance: %v"
#: cli/lib/install.go:13
0
#: cli/lib/install.go:13
2
msgid "Error installing %s: %v"
msgstr "Error installing %s: %v"
#: cli/lib/install.go:1
08
#: cli/lib/install.go:1
10
msgid "Error installing Git Library: %v"
msgstr "Error installing Git Library: %v"
#: cli/lib/install.go:8
5
#: cli/lib/install.go:8
7
msgid "Error installing Zip Library: %v"
msgstr "Error installing Zip Library: %v"
...
...
@@ -1183,8 +1183,8 @@ msgstr "Installing platform %s"
msgid "Installs one or more cores and corresponding tool dependencies."
msgstr "Installs one or more cores and corresponding tool dependencies."
#: cli/lib/install.go:39
#: cli/lib/install.go:40
#: cli/lib/install.go:41
msgid "Installs one or more specified libraries into the system."
msgstr "Installs one or more specified libraries into the system."
...
...
@@ -1295,7 +1295,7 @@ msgid "LIBNAME"
msgstr "LIBNAME"
#: cli/lib/check_deps.go:34
#: cli/lib/install.go:3
8
#: cli/lib/install.go:3
9
msgid "LIBRARY"
msgstr "LIBRARY"
...
...
@@ -2285,7 +2285,7 @@ msgid "VERSION"
msgstr "VERSION"
#: cli/lib/check_deps.go:34
#: cli/lib/install.go:3
8
#: cli/lib/install.go:3
9
msgid "VERSION_NUMBER"
msgstr "VERSION_NUMBER"
...
...
@@ -2650,12 +2650,12 @@ msgstr "for a specific version."
#: cli/lib/check_deps.go:38
#: cli/lib/download.go:38
#: cli/lib/install.go:4
2
#: cli/lib/install.go:4
3
msgid "for the latest version."
msgstr "for the latest version."
#: cli/lib/check_deps.go:39
#: cli/lib/install.go:4
3
#: cli/lib/install.go:4
4
msgid "for the specific version."
msgstr "for the specific version."
...
...
i18n/rice-box.go
View file @
3d5b4300
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment