Skip to content

Commit

Permalink
Resolve #79, build changes
Browse files Browse the repository at this point in the history
  • Loading branch information
lin-ycv committed Jan 24, 2024
1 parent 8f96d5a commit 78e94cb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/workflows/packageManagers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:

jobs:
build:
if: "!github.event.release.prerelease"
runs-on: windows-latest

steps:
Expand Down
4 changes: 2 additions & 2 deletions Everything.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ internal IEnumerable<Result> Query(string query, Settings setting)
{
if (query.Contains(kv.Key, StringComparison.OrdinalIgnoreCase))
{
sb.Append(kv.Value + ';');
sb.Append(kv.Value + ' ');
query = query.Replace(kv.Key, string.Empty);
}
}

if (sb.Length > 0)
{
query = query.Trim() + " ext:" + sb.ToString();
query = query.Trim() + " " + sb.ToString();
}
}

Expand Down
17 changes: 9 additions & 8 deletions NSIS/exeCreator.nsi
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
; Silent switch /S/
; Pass in /Dver=0.00.0 before calling the script to set the version
; ie: makensis /Dver=0.77.0 .\exeCreator.nsi
; Doc: https://nsis.sourceforge.io/Docs/Chapter4.html
!define EPT "EverythingPT"
!define PT "PowerToys.exe"

Expand Down Expand Up @@ -28,33 +29,33 @@ Unicode True

;--------------------------------

; Pages

Page directory
Page instfiles

;--------------------------------

Section ""
SetAutoClose True

; Execute TaskKill to terminate the specified process
ExecWait '"$%SystemRoot%\system32\TaskKill.exe" /F /IM ${PT}'
;ExecWait '"$%SystemRoot%\system32\TaskKill.exe" /F /IM ${PT}'
ExecWait 'wmic process where name="${PT}" call terminate'
Sleep 1000

SetOutPath $INSTDIR
GetFullPathName $0 "$EXEDIR\"
GetFullPathName $0 $0
File /r ".\..\..\..\..\..\..\x64\Release\RunPlugins\Everything\*"

IfSilent +2
MessageBox MB_OK|MB_ICONINFORMATION|MB_TOPMOST "${EPT} installed, please restart ${PT}"
IfFileExists "$LOCALAPPDATA\PowerToys\${PT}" 0 +2
Exec '"$LOCALAPPDATA\PowerToys\${PT}"'

IfFileExists "$PROGRAMFILES64\PowerToys\${PT}" 0 +2
Exec '"$PROGRAMFILES64\PowerToys\${PT}"'

SectionEnd

;--------------------------------

Function .onInit
Function .onInit

System::Call 'kernel32::CreateMutex(p 0, i 0, t "ACFEF7F6-7856-4BB3-82E3-0877CBB4E9C7") p .r1 ?e'
Pop $R0
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ There are now 4 different methods of installation, chose the one you prefer:

Detailed explanations and instructions are on the [release page](https://github.com/lin-ycv/EverythingPowerToys/releases/latest)

[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/linycv)

#### Requirements
* [PowerToys](https://learn.microsoft.com/en-us/windows/powertoys/)
* [Everything](https://www.voidtools.com/) (non-lite version) needs to be installed separately and **running**.
Expand Down
16 changes: 10 additions & 6 deletions settings.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Lines starting with # are comments
# Search filters, filters result with extension type, seperated by ;
Audio: = aac;ac3;aif;aifc;aiff;amr;ape;au;cda;dts;fla;flac;it;m1a;m2a;m3u;m4a;m4b;m4p;mid;midi;mka;mod;mp2;mp3;mpa;ogg;opus;ra;rmi;spc;rmi;snd;umx;voc;wav;weba;wma;xm
Zip: = 7z;ace;arj;bz2;cab;gz;gzip;jar;r00;r01;r02;r03;r04;r05;r06;r07;r08;r09;r10;r11;r12;r13;r14;r15;r16;r17;r18;r19;r20;r21;r22;r23;r24;r25;r26;r27;r28;r29;rar;tar;tgz;z;zip
Doc: = c;cc;chm;cpp;cs;css;csv;cxx;doc;docm;docx;dot;dotm;dotx;epub;gh;h;hpp;htm;html;hxx;ini;java;js;json;lua;mht;mhtml;mobi;odp;ods;odt;pdf;php;potx;potm;ppam;ppsm;ppsx;pps;ppt;pptm;pptx;pub;py;rtf;sldm;sldx;thmx;txt;vsd;wpd;wps;wri;xlam;xls;xlsb;xlsm;xlsx;xltm;xltx;xml;vb
Exe: = bat;cmd;exe;msi;msp;msu;ps1;scr
Pic: = ani;apng;bmp;bpg;cur;gif;ico;jfi;jfif;jif;jpe;jpeg;jpg;pcx;png;psb;psd;rle;svg;tga;tif;tiff;webp;wmf
Video: = 3g2;3gp;3gp2;3gpp;amv;asf;asx;avi;bdmv;bik;d2v;divx;drc;dsa;dsm;dss;dsv;evo;f4v;flc;fli;flic;flv;hdmov;ifo;ivf;m1v;m2p;m2t;m2ts;m2v;m4v;mkv;mp2v;mp4;mp4v;mpe;mpeg;mpg;mpls;mpv2;mpv4;mov;mts;ogm;ogv;pss;pva;qt;ram;ratdvd;rm;rmm;rmvb;roq;rpm;smil;smk;swf;tp;tpr;ts;vob;vp6;webm;wm;wmp;wmv
Audio: = ext:aac;ac3;aif;aifc;aiff;amr;ape;au;cda;dts;fla;flac;it;m1a;m2a;m3u;m4a;m4b;m4p;mid;midi;mka;mod;mp2;mp3;mpa;ogg;opus;ra;rmi;spc;rmi;snd;umx;voc;wav;weba;wma;xm
Zip: = ext:7z;ace;arj;bz2;cab;gz;gzip;jar;r00;r01;r02;r03;r04;r05;r06;r07;r08;r09;r10;r11;r12;r13;r14;r15;r16;r17;r18;r19;r20;r21;r22;r23;r24;r25;r26;r27;r28;r29;rar;tar;tgz;z;zip
Doc: = ext:c;cc;chm;cpp;cs;css;csv;cxx;doc;docm;docx;dot;dotm;dotx;epub;gh;h;hpp;htm;html;hxx;ini;java;js;json;lua;mht;mhtml;mobi;odp;ods;odt;pdf;php;potx;potm;ppam;ppsm;ppsx;pps;ppt;pptm;pptx;pub;py;rtf;sldm;sldx;thmx;txt;vsd;wpd;wps;wri;xlam;xls;xlsb;xlsm;xlsx;xltm;xltx;xml;vb
Exe: = ext:bat;cmd;exe;msi;msp;msu;ps1;scr
Pic: = ext:ani;apng;bmp;bpg;cur;gif;ico;jfi;jfif;jif;jpe;jpeg;jpg;pcx;png;psb;psd;rle;svg;tga;tif;tiff;webp;wmf
Video: = ext:3g2;3gp;3gp2;3gpp;amv;asf;asx;avi;bdmv;bik;d2v;divx;drc;dsa;dsm;dss;dsv;evo;f4v;flc;fli;flic;flv;hdmov;ifo;ivf;m1v;m2p;m2t;m2ts;m2v;m4v;mkv;mp2v;mp4;mp4v;mpe;mpeg;mpg;mpls;mpv2;mpv4;mov;mts;ogm;ogv;pss;pva;qt;ram;ratdvd;rm;rmm;rmvb;roq;rpm;smil;smk;swf;tp;tpr;ts;vob;vp6;webm;wm;wmp;wmv

# Search filters, filters result with custom path(s), seperated by |
# Demo: = C:\Windows\|C:\ProgramData

0 comments on commit 78e94cb

Please sign in to comment.