github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35120 from eparis/hack-sort 

Automatic merge from submit-queue

Use LC_ALL=C with sort

In some user env LANG=C might lose:

Wrong:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LANG=C sort
test/images/porter
test/images/port-forward-tester
```
Right:
```
echo -e "test/images/port-forward-tester\ntest/images/porter" | LC_ALL=C sort
test/images/port-forward-tester
test/images/porter
```
pull/6/head
Kubernetes Submit Queue 2016-10-19 08:45:19 -07:00 committed by GitHub
parent d4087d0b73 b670f76232
commit 10a0d2a468
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/verify-golint.sh
View File

@ -39,12 +39,12 @@ array_contains () {
# Check that the file is in alphabetical order
linted_file="${KUBE_ROOT}/hack/.linted_packages"
if ! diff -u "${linted_file}" <(LANG=C sort "${linted_file}"); then
if ! diff -u "${linted_file}" <(LC_ALL=C sort "${linted_file}"); then
{
echo
echo "hack/.linted_packages is not in alphabetical order. Please sort it:"
echo
echo " LANG=C sort -o hack/.linted_packages hack/.linted_packages"
echo " LC_ALL=C sort -o hack/.linted_packages hack/.linted_packages"
echo
} >&2
false
@ -104,7 +104,7 @@ else
for p in "${linted[@]}"; do
echo " echo $p >> hack/.linted_packages"
done
echo " LANG=C sort -o hack/.linted_packages hack/.linted_packages"
echo " LC_ALL=C sort -o hack/.linted_packages hack/.linted_packages"
echo
echo 'You can test via this script and commit the result.'
echo