Skip to content

Commit 1b8c154

Browse files
authored
Merge pull request #615 from Flow-Launcher/standardise_exe_installer
Standardise Flow's exe installer + readme update
2 parents d2bec9c + 8d04590 commit 1b8c154

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ async Task updateAction()
108108
}
109109

110110
Log.Error("MainViewModel", "Unexpected ResultViewUpdate ends");
111-
}
112-
113-
;
111+
};
114112

115113
void continueAction(Task t)
116114
{

Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ internal async ValueTask<List<Result>> RequestUpdate(string search, Cancellation
185185

186186
var uninstallSearch = search.Replace(Settings.HotkeyUpdate, string.Empty).TrimStart();
187187

188-
189188
var resultsForUpdate =
190189
from existingPlugin in Context.API.GetAllPlugins()
191190
join pluginFromManifest in pluginsManifest.UserPlugins

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Flow Launcher. Dedicated to make your workflow flow more seamlessly. Aimed at be
4949

5050
### Installation
5151

52-
| [Windows 7 and up installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Portable.zip) | `WinGet install "Flow Launcher"` |
52+
| [Windows 7+ installer](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Setup.exe) | [Portable](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest/download/Flow-Launcher-Portable.zip) | `WinGet install "Flow Launcher"` |
5353
| --------------------------------- | --------------------------------- | --------------------------------- |
5454

5555
Windows may complain about security due to code not being signed, this will be completed at a later stage. If you downloaded from this repo, you are good to continue the set up.
@@ -59,10 +59,10 @@ Windows may complain about security due to code not being signed, this will be c
5959
- Open context menu: on the selected result, press <kbd>Ctrl</kbd>+<kbd>O</kbd>/<kbd>Shift</kbd>+<kbd>Enter</kbd>.
6060
- Cancel/Return to previous screen: <kbd>Esc</kbd>.
6161
- Install/Uninstall/Update plugins: in the search window, type `pm` `install`/`uninstall`/`update` + the plugin name.
62-
- Saved user settings are located:
62+
- Type `flow user data` to open your saved user settings folder. They are located at:
6363
- If using roaming: `%APPDATA%\FlowLauncher`
6464
- If using portable, by default: `%localappdata%\FlowLauncher\app-<VersionOfYourFlowLauncher>\UserData`
65-
- Logs are saved along with your user settings folder.
65+
- Type `open log location` to open your logs folder, they are saved along with your user settings folder.
6666

6767
[More tips](https://flow-launcher.github.io/docs/#/usage-tips)
6868

@@ -74,7 +74,7 @@ If you are using Python plugins, flow will prompt to either select the location
7474

7575
Vist [here](https://flow-launcher.github.io/docs/#/plugins) for our plugin portfolio.
7676

77-
If you are keen to write your own plugin for flow, please take a look at our plugin development documentation for [C#](https://flow-launcher.github.io/docs/#/develop-csharp-plugins) or [Python](https://flow-launcher.github.io/docs/#/develop-py-plugins)
77+
If you are keen to write your own plugin for flow, please take a look at our plugin development documentation for [C#](https://flow-launcher.github.io/docs/#/develop-dotnet-plugins) or [Python](https://flow-launcher.github.io/docs/#/develop-py-plugins)
7878

7979
## Questions/Suggestions
8080

Scripts/post_build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
8989
Move-Item $temp\* $output -Force
9090
Remove-Item $temp
9191

92-
$file = "$output\Flow-Launcher-v$version.exe"
92+
$file = "$output\Flow-Launcher-Setup.exe"
9393
Write-Host "Filename: $file"
9494

9595
Move-Item "$output\Setup.exe" $file -Force
@@ -109,7 +109,7 @@ function Publish-Self-Contained ($p) {
109109

110110
function Publish-Portable ($outputLocation, $version) {
111111

112-
& $outputLocation\Flow-Launcher-v$v.exe --silent | Out-Null
112+
& $outputLocation\Flow-Launcher-Setup.exe --silent | Out-Null
113113
mkdir "$env:LocalAppData\FlowLauncher\app-$version\UserData"
114114
Compress-Archive -Path $env:LocalAppData\FlowLauncher -DestinationPath $outputLocation\Flow-Launcher-Portable.zip
115115
}

0 commit comments

Comments
 (0)