Skip to content

Commit 42550e4

Browse files
gilbertsoftrfay
authored andcommitted
[BUGFIX] Increase EnVar internal buffer to 16K, fixes ddev#1971, fixes ddev#1970 (ddev#1974)
* [BUGFIX] Update to last EnVar plugin See https://github.com/GsNSIS/EnVar/tree/a454526d98b4753178115b829c55a2958423b75f
1 parent 1e734f5 commit 42550e4

File tree

9 files changed

+8
-5
lines changed

9 files changed

+8
-5
lines changed

.circleci/linux_circle_vm_setup.sh

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ done
2525

2626
# Get the Stubs and Plugins for makensis; the linux makensis build doesn't do this.
2727
wget https://sourceforge.net/projects/nsis/files/NSIS%203/3.04/nsis-3.04.zip/download && sudo unzip -d /usr/local/share download && sudo mv /usr/local/share/nsis-3.04 /usr/local/share/nsis
28+
wget https://github.com/GsNSIS/EnVar/releases/latest/download/EnVar-Plugin.zip && sudo unzip -d /usr/local/share/nsis EnVar-Plugin.zip
29+
wget https://github.com/DigitalMediaServer/NSIS-INetC-plugin/releases/latest/download/INetC.zip && sudo unzip -d /usr/local/share/nsis/Plugins INetC.zip
2830

2931
mkcert -install
3032

.circleci/macos_circle_vm_setup.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended &
1919

2020
brew tap drud/ddev
2121

22-
brew install mysql-client zip nsis jq expect coreutils golang ddev mkcert osslsigncode ghr
23-
brew link mysql-client zip nsis jq expect coreutils golang ddev mkcert osslsigncode ghr
22+
brew install mysql-client zip makensis jq expect coreutils golang ddev mkcert osslsigncode ghr
23+
brew link mysql-client zip makensis jq expect coreutils golang ddev mkcert osslsigncode ghr
2424

2525
brew link --force mysql-client
2626

27+
# Get the Plugins for NSIS
28+
curl -fsSL -o /tmp/EnVar-Plugin.zip https://github.com/GsNSIS/EnVar/releases/latest/download/EnVar-Plugin.zip && sudo unzip -d /usr/local/share/nsis /tmp/EnVar-Plugin.zip
29+
curl -fsSL -o /tmp/INetC.zip https://github.com/DigitalMediaServer/NSIS-INetC-plugin/releases/latest/download/INetC.zip && sudo unzip -d /usr/local/share/nsis/Plugins /tmp/INetC.zip
30+
2731
# homebrew sometimes removes /usr/local/etc/my.cnf.d
2832
mkdir -p /usr/local/etc/my.cnf.d
2933

winpkg/ddev.nsi

-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
* Add local include and plugin directories
4040
*/
4141
!addincludedir include
42-
!addplugindir /x86-ansi plugins\x86-ansi
43-
!addplugindir /x86-unicode plugins\x86-unicode
44-
!addplugindir /amd64-unicode plugins\amd64-unicode
4542

4643

4744

-10 KB
Binary file not shown.
-240 KB
Binary file not shown.

winpkg/plugins/x86-ansi/EnVar.dll

-8.5 KB
Binary file not shown.

winpkg/plugins/x86-ansi/INetC.dll

-235 KB
Binary file not shown.

winpkg/plugins/x86-unicode/EnVar.dll

-9 KB
Binary file not shown.

winpkg/plugins/x86-unicode/INetC.dll

-239 KB
Binary file not shown.

0 commit comments

Comments
 (0)