Merge pull request #1919 from livecode/bugfix-21014

[Bug 21014] Fix installing extensions from local .lce files
livecode · Feb 28, 2018 · 38f7c67 · 38f7c67
2 parents 412f176 + e922e14
commit 38f7c67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Toolset/libraries/revideextensionlibrary.livecodescript b/Toolset/libraries/revideextensionlibrary.livecodescript
@@ -266,7 +266,7 @@ end revIDEExtensionStandaloneSettingsInfo
 ##############################
 
 private command __extensionDownloadBegin pExtensionUrl, pType, pCallbackObject, pCallbackMessage
-   if not pExtensionUrl begins with "http" then
+   if not (pExtensionUrl begins with "http") then
       # pExtensionPath is not a URL or file on disk
       return "Could not download extension. The extension must be a URL" && \
             "to a valid package:" && pExtensionUrl for error

diff --git a/Toolset/palettes/extension manager/revideextensionmanagerbehavior.livecodescript b/Toolset/palettes/extension manager/revideextensionmanagerbehavior.livecodescript
@@ -52,6 +52,12 @@ end installNew
 on installExtension pExtensionURL, pTypeID, pType
    lock screen  
    showList pType
-   revIDEExtensionDownloadAndInstall pExtensionURL, pType
+   if pExtensionURL begins with "http" then
+      // get from extensions store
+      revIDEExtensionDownloadAndInstall pExtensionURL
+   else
+      // get from local .lce file
+      revIDEExtensionInstall pExtensionURL, pType
+   end if
    unlock screen
-end installExtension
+end installExtension
diff --git a/notes/bugfix-21014.md b/notes/bugfix-21014.md
@@ -0,0 +1 @@
+# Fix installing extensions from local .lce files