mirror of
https://github.com/lin-ycv/EverythingPowerToys.git
synced 2025-04-04 22:23:55 +08:00
Change to ModernUI Installer
This commit is contained in:
parent
37d1878184
commit
b2e86295fc
11
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
11
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
blank_issues_enabled: true
|
||||||
|
contact_links:
|
||||||
|
- name: EverythingPT is a Virus
|
||||||
|
url: https://github.com/lin-ycv/EverythingPowerToys/wiki/Known-Issues#flagged-by-antivirus-as-malicious
|
||||||
|
about: Installer being quarantined/Antivirus removes the installer.
|
||||||
|
- name: How do I use/configure...
|
||||||
|
url: https://github.com/lin-ycv/EverythingPowerToys/wiki/Features
|
||||||
|
about: EverythingPT is working, but not the way you want.
|
||||||
|
- name: Review open issues
|
||||||
|
url: https://github.com/lin-ycv/EverythingPowerToys/issues?q=is%3Aissue
|
||||||
|
about: Please check if your issue isn't already there.
|
8
.github/README.md
vendored
8
.github/README.md
vendored
@ -6,9 +6,9 @@
|
|||||||
[](https://github.com/lin-ycv/EverythingPowerToys/releases/latest)
|
[](https://github.com/lin-ycv/EverythingPowerToys/releases/latest)
|
||||||
[](https://github.com/lin-ycv/EverythingPowerToys/releases/)
|
[](https://github.com/lin-ycv/EverythingPowerToys/releases/)
|
||||||
[](https://github.com/lin-ycv/EverythingPowerToys/releases/latest)<br>
|
[](https://github.com/lin-ycv/EverythingPowerToys/releases/latest)<br>
|
||||||
[](https://github.com/microsoft/winget-pkgs/tree/master/manifests/l/lin-ycv/EverythingPowerToys)
|
|
||||||
[](https://community.chocolatey.org/packages/everythingpowertoys)
|
[](https://community.chocolatey.org/packages/everythingpowertoys)
|
||||||
[](https://scoop.sh/#/apps?q=everything-powertoys)
|
[](https://scoop.sh/#/apps?q=everything-powertoys)
|
||||||
|
[](https://github.com/microsoft/winget-pkgs/tree/master/manifests/l/lin-ycv/EverythingPowerToys)
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -19,9 +19,9 @@ This adds the ability to search the computer for files and folders using [Everyt
|
|||||||
There are 4 different methods of installation, chose the one you prefer:
|
There are 4 different methods of installation, chose the one you prefer:
|
||||||
1) Chocolatey
|
1) Chocolatey
|
||||||
2) Scoop
|
2) Scoop
|
||||||
3) Self-Extraction Installer (EXE)
|
3) WinGet
|
||||||
4) Manual Installation (ZIP)
|
4) Self-Extraction Installer (EXE)
|
||||||
5) ~~WinGet~~ (Deprecated)
|
5) Manual Installation (ZIP)
|
||||||
|
|
||||||
Detailed explanations and instructions are on the [wiki page](https://github.com/lin-ycv/EverythingPowerToys/wiki)
|
Detailed explanations and instructions are on the [wiki page](https://github.com/lin-ycv/EverythingPowerToys/wiki)
|
||||||
|
|
||||||
|
1
Main.cs
1
Main.cs
@ -187,7 +187,6 @@ namespace Community.PowerToys.Run.Plugin.Everything
|
|||||||
if (_setting.Updates)
|
if (_setting.Updates)
|
||||||
Task.Run(() => new Update.UpdateChecker().Async(Assembly.GetExecutingAssembly().GetName().Version, _setting, upSettings, _isArm));
|
Task.Run(() => new Update.UpdateChecker().Async(Assembly.GetExecutingAssembly().GetName().Version, _setting, upSettings, _isArm));
|
||||||
|
|
||||||
Thread.Sleep(500); // Wait for Everything to start
|
|
||||||
if (Everything_GetMinorVersion() < 5) _setting.Getfilters();
|
if (Everything_GetMinorVersion() < 5) _setting.Getfilters();
|
||||||
_everything = new Everything(_setting);
|
_everything = new Everything(_setting);
|
||||||
_contextMenuLoader = new ContextMenuLoader(context, _setting.Context);
|
_contextMenuLoader = new ContextMenuLoader(context, _setting.Context);
|
||||||
|
@ -1,12 +1,27 @@
|
|||||||
; Silent switch /S
|
!include "MUI2.nsh"
|
||||||
; to check silent mode `start /wait EverythingPT-0.81.0-x64.exe /S`
|
|
||||||
; and `echo %ERRORLEVEL%` to check if 0 or 2
|
|
||||||
; Pass in /Dver=0.00.0 /Ddirect=$(TargetDir) before calling the script to set the version
|
|
||||||
; ie: makensis /Dver=0.77.0 /Ddirect=bin\x64\Release\Everything\ .\exeCreator.nsi
|
|
||||||
; Doc: https://nsis.sourceforge.io/Docs/Chapter4.html
|
|
||||||
!define EPT "EverythingPT"
|
!define EPT "EverythingPT"
|
||||||
|
!define SMWCUE "Software\Microsoft\Windows\CurrentVersion\Uninstall\EverythingPowerToys"
|
||||||
|
;--------------------------------
|
||||||
|
;General
|
||||||
|
Name "${EPT}"
|
||||||
|
BrandingText "v${ver} ${platform}"
|
||||||
|
SetCompressor zlib
|
||||||
|
OutFile ".\..\bin\${EPT}-${ver}-${platform}.exe"
|
||||||
|
Unicode True
|
||||||
|
RequestExecutionLevel user
|
||||||
|
SetOverwrite ifnewer
|
||||||
|
InstallDir "$LOCALAPPDATA\Microsoft\PowerToys\PowerToys Run\Plugins\Everything"
|
||||||
|
FileErrorText "Can't access: $\r$\n$\r$\n$0$\r$\n$\r$\nPowerToys is probably still running, please close it and retry."
|
||||||
|
;--------------------------------
|
||||||
|
;Interface Settings
|
||||||
|
!define MUI_ICON "Everything.ico"
|
||||||
|
!define MUI_ABORTWARNING
|
||||||
|
;--------------------------------
|
||||||
|
;Pages
|
||||||
|
!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
|
||||||
|
!insertmacro MUI_PAGE_INSTFILES
|
||||||
|
|
||||||
LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
|
!insertmacro MUI_LANGUAGE "English"
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
;Version Information
|
;Version Information
|
||||||
VIProductVersion "${ver}.0"
|
VIProductVersion "${ver}.0"
|
||||||
@ -17,37 +32,20 @@ LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
|
|||||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${ver}"
|
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${ver}"
|
||||||
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${ver}"
|
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${ver}"
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
|
|
||||||
BrandingText "${EPT} v${ver}"
|
|
||||||
CRCCheck force
|
|
||||||
FileErrorText "Can't write: $\r$\n$\r$\n$0$\r$\n$\r$\nPowerToys is probably still running, please close it and retry."
|
|
||||||
Icon Everything.ico
|
|
||||||
InstallDir "$LOCALAPPDATA\Microsoft\PowerToys\PowerToys Run\Plugins\Everything"
|
|
||||||
Name "${EPT}"
|
|
||||||
OutFile ".\..\bin\${EPT}-${ver}-${platform}.exe"
|
|
||||||
RequestExecutionLevel user
|
|
||||||
;SetCompressor /SOLID /FINAL lzma ; this increases chances of AV FP?
|
|
||||||
LicenseData "..\LICENSE"
|
|
||||||
|
|
||||||
;--------------------------------
|
|
||||||
|
|
||||||
Page license
|
|
||||||
Page instfiles
|
|
||||||
|
|
||||||
;--------------------------------
|
|
||||||
|
|
||||||
Section ""
|
Section ""
|
||||||
|
|
||||||
ClearErrors
|
|
||||||
SetOutPath $INSTDIR
|
SetOutPath $INSTDIR
|
||||||
GetFullPathName $0 "$EXEDIR\"
|
|
||||||
GetFullPathName $0 $0
|
|
||||||
File /r "${direct}\*"
|
File /r "${direct}\*"
|
||||||
|
|
||||||
|
WriteRegStr HKCU "${SMWCUE}" "DisplayName" "${EPT} (${platform})"
|
||||||
|
WriteRegStr HKCU "${SMWCUE}" "DisplayVersion" "${ver}"
|
||||||
|
WriteRegStr HKCU "${SMWCUE}" "InstallLocation" "$INSTDIR"
|
||||||
|
WriteRegStr HKCU "${SMWCUE}" "Publisher" "Lin-ycv"
|
||||||
|
|
||||||
IfErrors 0 +5
|
IfErrors 0 +5
|
||||||
SetErrorlevel 1
|
SetErrorlevel 1
|
||||||
IfSilent +2
|
IfSilent +2
|
||||||
MessageBox MB_ICONEXCLAMATION "Unable to (un)install, PowerToys is probably still running, please close it manually before (un)install."
|
MessageBox MB_ICONEXCLAMATION "Unable to install, PowerToys is probably still running, please close it manually before install."
|
||||||
Abort
|
Abort
|
||||||
|
|
||||||
|
SetErrorlevel 0
|
||||||
SectionEnd
|
SectionEnd
|
2
Properties/Resources.Designer.cs
generated
2
Properties/Resources.Designer.cs
generated
@ -233,7 +233,7 @@ namespace Community.PowerToys.Run.Plugin.Everything.Properties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to The "Include inglobal result" option is turned on for the History plugin, which could lead to conflicts with EPT..
|
/// Looks up a localized string similar to The "Include in global result" option is turned on for the History plugin, which could lead to conflicts with EPT..
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string History {
|
public static string History {
|
||||||
get {
|
get {
|
||||||
|
@ -269,7 +269,7 @@ Latest: {1}</value>
|
|||||||
<value>Everything64.dll is missing, automatically download this file?</value>
|
<value>Everything64.dll is missing, automatically download this file?</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="History" xml:space="preserve">
|
<data name="History" xml:space="preserve">
|
||||||
<value>The "Include inglobal result" option is turned on for the History plugin, which could lead to conflicts with EPT.</value>
|
<value>The "Include in global result" option is turned on for the History plugin, which could lead to conflicts with EPT.</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="scm" xml:space="preserve">
|
<data name="scm" xml:space="preserve">
|
||||||
<value>Shell context menu (Ctrl+M)</value>
|
<value>Shell context menu (Ctrl+M)</value>
|
||||||
|
@ -61,8 +61,8 @@ namespace Community.PowerToys.Run.Plugin.Everything.Update
|
|||||||
File.WriteAllBytes(fileName, fileContent);
|
File.WriteAllBytes(fileName, fileContent);
|
||||||
Process.Start(fileName);
|
Process.Start(fileName);
|
||||||
|
|
||||||
//foreach (Process pt in Process.GetProcessesByName("PowerToys"))
|
foreach (Process pt in Process.GetProcessesByName("PowerToys"))
|
||||||
// pt.Kill();
|
pt.Kill();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -83,11 +83,11 @@ namespace Community.PowerToys.Run.Plugin.Everything.Update
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
if (s.LoggingLevel < LogLevel.Error)
|
if (s.LoggingLevel <= LogLevel.Info)
|
||||||
Log.Exception($"EPT: Unable to check for update", e, GetType());
|
Log.Exception($"EPT: Unable to check for update", e, GetType());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s.LoggingLevel < LogLevel.Error)
|
if (s.LoggingLevel <= LogLevel.Info)
|
||||||
Log.Info("EPT: Checking Update...Done", GetType());
|
Log.Info("EPT: Checking Update...Done", GetType());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user