Commit 9765c79
committed
sublimetext3: fix softwareName to not conflict with sublimetext4
For details about all of this, see
Jackenmen/choco-auto#7 which contains a long
discussion about bugfixes/etc. in the ST4 package, which we needed to be
able to be installed alongside ST3 without any problems. Specifically,
Jackenmen/choco-auto#7 (comment)
is relevant.
While I'm here, fix the file type encoding on this file to be UTF-8 with
line feeds EOLs; it was UTF-16 LE with CR+LF EOLs for some reason, which
confuses everything (grep, editors, and git itself). I don't know why
this was committed this way to begin with, but it was.
Before:
$ file sublimetext3/tools/*
sublimetext3/tools/chocolateyInstall.ps1: UTF-8 Unicode (with BOM) text
sublimetext3/tools/chocolateyUninstall.ps1: Little-endian UTF-16 Unicode text, with CRLF line terminators
After:
$ file sublimetext3/tools/*
sublimetext3/tools/chocolateyInstall.ps1: UTF-8 Unicode (with BOM) text
sublimetext3/tools/chocolateyUninstall.ps1: UTF-8 Unicode (with BOM) text
A 'git diff' -- as well as GitHub's diff (PRs, etc.) -- will show
"binary" for things because the ORIGINAL file is in UTF-16 and UTF-16
is not ASCII-compatible. Verification of that fact:
$ curl -s -S -L -o- 'https://raw.githubusercontent.com/pauby/ChocoPackages/master/automatic/sublimetext3/tools/chocolateyUninstall.ps1' | file -
/dev/stdin: Little-endian UTF-16 Unicode text, with CRLF line terminators
If we force --text, you will see the original UTF-16 LE data itself:
$ git diff
diff --git a/automatic/sublimetext3/tools/chocolateyUninstall.ps1 b/automatic/sublimetext3/tools/chocolateyUninstall.ps1
index 2654119..0d16edf 100644
Binary files a/automatic/sublimetext3/tools/chocolateyUninstall.ps1 and b/automatic/sublimetext3/tools/chocolateyUninstall.ps1 differ
$ git diff --text
diff --git a/automatic/sublimetext3/tools/chocolateyUninstall.ps1 b/automatic/sublimetext3/tools/chocolateyUninstall.ps1
index 2654119..0d16edf 100644
--- a/automatic/sublimetext3/tools/chocolateyUninstall.ps1
+++ b/automatic/sublimetext3/tools/chocolateyUninstall.ps1
@@ -1,35 +1,35 @@
-<FF><FE>$^@e^@r^@r^@o^@r^@A^@c^@t^@i^@o^@n^@p^@r^@e^@f^@e^@r^@e^@n^@c^@e^@ ^@=^@ ^@'^@s^@t^@o^@p^@'^@^M^@
-^@^M^@
-^@$^@p^@A^@c^@k^@A^@g^@e^@A^@r^@g^@s^@ ^@=^@ ^@@^@{^@^M^@
-^@ ^@ ^@ ^@ ^@p^@A^@c^@k^@A^@g^@e^@n^@A^@m^@e^@ ^@ ^@ ^@ ^@=^@ ^@$^@e^@n^@v^@:^@C^@h^@o^@c^@o^@l^@A^@t^@e^@y^@p^@A^@c^@k^@A^@g^@e^@n^@A^@m^@e^@^M^@
-^@ ^@ ^@ ^@ ^@s^@o^@f^@t^@w^@A^@r^@e^@n^@A^@m^@e^@ ^@ ^@ ^@=^@ ^@'^@s^@U^@b^@l^@i^@m^@e^@ ^@t^@e^@x^@t^@*^@'^@^M^@
-^@ ^@ ^@ ^@ ^@f^@i^@l^@e^@t^@y^@p^@e^@ ^@ ^@ ^@ ^@ ^@ ^@ ^@=^@ ^@'^@e^@x^@e^@'^@^M^@
-^@ ^@ ^@ ^@ ^@s^@i^@l^@e^@n^@t^@A^@r^@g^@s^@ ^@ ^@ ^@ ^@ ^@=^@ ^@'^@/^@s^@i^@l^@e^@n^@t^@ ^@/^@v^@e^@r^@y^@s^@i^@l^@e^@n^@t^@ ^@/^@s^@U^@p^@p^@r^@e^@s^@s^@m^@s^@g^@b^@o^@x^@e^@s^@ ^@/^^@n^@o^@r^@e^@s^@t^@A^@r^@t^@ ^@/^@t^@A^@s^@k^@s^@=^@"^@c^@o^@n^@t^@e^@x^@t^@e^@n^@t^@r^@y^@"^@'^@^M^@
...1 parent 9ee33b6 commit 9765c79
1 file changed
+0
-0
lines changedBinary file not shown.
0 commit comments