\#28: Fix Linux upgrade
This commit is contained in:
10
src/App.js
10
src/App.js
@@ -113,9 +113,12 @@ class App extends IPCContainer {
|
||||
};
|
||||
|
||||
handleDownloadUpgrade = () => {
|
||||
const url = this.props.UpgradeData.urls[0];
|
||||
const name = this.props.Platform === 'win32' ? 'upgrade.exe' : this.props.Platform === 'darwin' ? 'upgrade.dmg' : extractFileNameFromURL(url);
|
||||
this.props.downloadItem(name, Constants.INSTALL_TYPES.Upgrade, url, this.onDownloadFileComplete);
|
||||
const name = (this.props.Platform === 'win32') ?
|
||||
'upgrade.exe' :
|
||||
(this.props.Platform === 'darwin') ?
|
||||
'upgrade.dmg' :
|
||||
'repertory-ui_' + this.props.UpgradeVersion + '_linux_x86_64.AppImage';
|
||||
this.props.downloadItem(name, Constants.INSTALL_TYPES.Upgrade, this.props.UpgradeData.urls[0], this.onDownloadFileComplete);
|
||||
};
|
||||
|
||||
installDependency = result => {
|
||||
@@ -338,6 +341,7 @@ const mapStateToProps = state => {
|
||||
UpgradeAvailable: state.relver.UpgradeAvailable,
|
||||
UpgradeData: state.relver.UpgradeData,
|
||||
UpgradeDismissed: state.relver.UpgradeDismissed,
|
||||
UpgradeVersion: state.relver.UpgradeVersion,
|
||||
Version: state.common.Version,
|
||||
VersionLookup: state.relver.VersionLookup,
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ export const detectUIUpgrade = () => {
|
||||
data.Versions[appPlatform] &&
|
||||
(data.Versions[appPlatform].length > 0) &&
|
||||
(data.Versions[appPlatform][0] !== version)) {
|
||||
dispatch(setUIUpgradeData(data.Locations[appPlatform][data.Versions[appPlatform][0]]));
|
||||
dispatch(setUIUpgradeData(data.Locations[appPlatform][data.Versions[appPlatform][0]], data.Versions[appPlatform][0]));
|
||||
} else {
|
||||
dispatch(clearUIUpgrade());
|
||||
}
|
||||
@@ -115,4 +115,14 @@ export const setReleaseData = (locationsLookup, versionLookup)=> {
|
||||
};
|
||||
|
||||
export const setReleaseUpgradeAvailable = createAction('relver/setReleaseUpgradeAvailable');
|
||||
export const setUIUpgradeData = createAction('relver/setUIUpgradeData');
|
||||
|
||||
export const SET_UI_UPGRADE_DATA = 'relver/setUIUpgradeData';
|
||||
export const setUIUpgradeData = (upgradeData, version) => {
|
||||
return {
|
||||
type: SET_UI_UPGRADE_DATA,
|
||||
payload: {
|
||||
upgrade_data: upgradeData,
|
||||
version: version,
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -20,6 +20,7 @@ export const releaseVersionReducer = createReducer({
|
||||
ReleaseUpgradeAvailable: false,
|
||||
UpgradeAvailable: false,
|
||||
UpgradeData: null,
|
||||
UpgradeVersion: null,
|
||||
UpgradeDismissed: false,
|
||||
Version: -1,
|
||||
VersionLookup: versionLookup,
|
||||
@@ -30,6 +31,7 @@ export const releaseVersionReducer = createReducer({
|
||||
UpgradeAvailable: false,
|
||||
UpgradeDismissed: false,
|
||||
UpgradeData: null,
|
||||
UpgradeVersion: null,
|
||||
};
|
||||
},
|
||||
[Actions.SET_ACTIVE_RELEASE]: (state, action) => {
|
||||
@@ -64,11 +66,12 @@ export const releaseVersionReducer = createReducer({
|
||||
ReleaseUpgradeAvailable: action.payload,
|
||||
};
|
||||
},
|
||||
[Actions.setUIUpgradeData]: (state, action) => {
|
||||
[Actions.SET_UI_UPGRADE_DATA]: (state, action) => {
|
||||
return {
|
||||
...state,
|
||||
UpgradeAvailable: true,
|
||||
UpgradeData: action.payload,
|
||||
UpgradeData: action.payload.upgrade_data,
|
||||
UpgradeVersion: action.payload.version,
|
||||
UpgradeDismissed: false,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user