Skip to content

Standardise Flow's exe installer + readme update #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjw24 merged 5 commits into from
Aug 6, 2021
Merged

Standardise Flow's exe installer + readme update #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6785dc
standardise flow installer- remove version from exe installer
jjw24 Jul 28, 2021
15d677f
update readme to use standard exe installer
jjw24 Jul 28, 2021
a8d7dcd
remove extra space
jjw24 Jul 28, 2021
b023e8e
update readme
jjw24 Jul 29, 2021
8d04590
fix formatting
jjw24 Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ async Task updateAction()
}

Log.Error("MainViewModel", "Unexpected ResultViewUpdate ends");
}

;
};

void continueAction(Task t)
{
Expand Down
1 change: 0 additions & 1 deletion Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ internal async ValueTask<List<Result>> RequestUpdate(string search, Cancellation

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


var resultsForUpdate =
from existingPlugin in Context.API.GetAllPlugins()
join pluginFromManifest in pluginsManifest.UserPlugins
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Flow Launcher. Dedicated to make your workflow flow more seamlessly. Aimed at be

### Installation

| [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"` |
| [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"` |
| --------------------------------- | --------------------------------- | --------------------------------- |

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.
Expand All @@ -59,10 +59,10 @@ Windows may complain about security due to code not being signed, this will be c
- Open context menu: on the selected result, press <kbd>Ctrl</kbd>+<kbd>O</kbd>/<kbd>Shift</kbd>+<kbd>Enter</kbd>.
- Cancel/Return to previous screen: <kbd>Esc</kbd>.
- Install/Uninstall/Update plugins: in the search window, type `pm` `install`/`uninstall`/`update` + the plugin name.
- Saved user settings are located:
- Type `flow user data` to open your saved user settings folder. They are located at:
- If using roaming: `%APPDATA%\FlowLauncher`
- If using portable, by default: `%localappdata%\FlowLauncher\app-<VersionOfYourFlowLauncher>\UserData`
- Logs are saved along with your user settings folder.
- Type `open log location` to open your logs folder, they are saved along with your user settings folder.

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

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

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

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)
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)

## Questions/Suggestions

Expand Down
4 changes: 2 additions & 2 deletions Scripts/post_build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
Move-Item $temp\* $output -Force
Remove-Item $temp

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

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

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

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