Skip to content

Commit

Permalink
Merge pull request #80 from giusdp/main
Browse files Browse the repository at this point in the history
Embed grep for windows build
  • Loading branch information
francescotimperi authored Aug 23, 2023
2 parents 6d493c5 + d5eb682 commit 54e8061
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 4 deletions.
10 changes: 10 additions & 0 deletions bin/nuvfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ tasks:
status:
- test -e unzip.exe

grep.exe:
cmds:
- |-
if [[ "{{.OS}}" == "windows" ]]
cp windows/grep.exe {{.BIN}}
fi
status:
- test -e grep.exe

download-archive:
dir: "{{.BIN}}"
cmds:
Expand Down Expand Up @@ -231,6 +240,7 @@ tasks:
- echo {{.VERSION}} >windows/version.txt
- cp ../LICENSE windows/LICENSE
- task: unzip.exe
- task: grep.exe
- ./nuv getall OS=windows ARCH=amd64
- ./nuv windows build
- cp windows/*.msi ..
Expand Down
Binary file added bin/windows/grep.exe
Binary file not shown.
27 changes: 27 additions & 0 deletions bin/windows/grep.exe-license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2013, Алексей
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

* Neither the name of the {organization} nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 changes: 4 additions & 4 deletions bin/windows/wix.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"../windows/amd64/kops.exe",
"../windows/amd64/mc.exe",
"../windows/amd64/eksctl.exe",
"../windows/amd64/q.exe"
"../windows/amd64/q.exe",
"../windows/amd64/grep.exe"
]
},
"directories": [
],
"directories": [],
"env": {
"guid": "acd45cd4-4cde-45cc-9384-3ac6f4ff3cfd",
"vars": [
Expand All @@ -33,4 +33,4 @@
},
"shortcuts": {},
"choco": {}
}
}

0 comments on commit 54e8061

Please sign in to comment.