diff --git a/CHANGELOG.md b/CHANGELOG.md
index c96b045cc..f9fe830fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,9 +55,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Claim ID being null when reporting a claim that was not previously downloaded ([PR#1530](https://github.com/lbryio/lbry-app/pull/1530))
* URI and outpoint not being passed properly to API ([#1494](https://github.com/lbryio/lbry-app/issues/1494))
* Incorrect markdown preview on url with parentheses ([#1570](https://github.com/lbryio/lbry-app/issues/1570))
+ * Fix Linux upgrade path and add manual installation note ([#1606](https://github.com/lbryio/lbry-app/issues/1606))
+
-
## [0.21.6] - 2018-06-05
### Fixed
diff --git a/src/renderer/modal/modalDownloading/index.js b/src/renderer/modal/modalDownloading/index.js
index 4174b4577..ac9089bc0 100644
--- a/src/renderer/modal/modalDownloading/index.js
+++ b/src/renderer/modal/modalDownloading/index.js
@@ -1,17 +1,29 @@
import React from 'react';
import { connect } from 'react-redux';
import { doStartUpgrade, doCancelUpgrade } from 'redux/actions/app';
-import { selectDownloadProgress, selectDownloadComplete } from 'redux/selectors/app';
+import { doHideNotification } from 'lbry-redux';
+import {
+ selectDownloadProgress,
+ selectDownloadComplete,
+ selectUpgradeDownloadPath,
+} from 'redux/selectors/app';
import ModalDownloading from './view';
const select = state => ({
downloadProgress: selectDownloadProgress(state),
downloadComplete: selectDownloadComplete(state),
+ downloadItem: selectUpgradeDownloadPath(state),
});
const perform = dispatch => ({
startUpgrade: () => dispatch(doStartUpgrade()),
- cancelUpgrade: () => dispatch(doCancelUpgrade()),
+ cancelUpgrade: () => {
+ dispatch(doHideNotification());
+ dispatch(doCancelUpgrade());
+ },
});
-export default connect(select, perform)(ModalDownloading);
+export default connect(
+ select,
+ perform
+)(ModalDownloading);
diff --git a/src/renderer/modal/modalDownloading/view.jsx b/src/renderer/modal/modalDownloading/view.jsx
index 9829ec99a..06b595414 100644
--- a/src/renderer/modal/modalDownloading/view.jsx
+++ b/src/renderer/modal/modalDownloading/view.jsx
@@ -5,7 +5,13 @@ import Button from 'component/button';
class ModalDownloading extends React.PureComponent {
render() {
- const { downloadProgress, downloadComplete, startUpgrade, cancelUpgrade } = this.props;
+ const {
+ downloadProgress,
+ downloadComplete,
+ downloadItem,
+ startUpgrade,
+ cancelUpgrade,
+ } = this.props;
return (
+ {__( + 'To launch installation manually, close LBRY and run the command below in the terminal.' + )} +
+sudo dpkg -i {downloadItem}
{__('After the install is complete, please reopen the app.')}
) : null}