diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ec058c..218961d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.6.2 (2016-06-27) + +- Hotfix: Fixed broken winpty dependency since 1.6.0 on Windows + + ## 1.6.1 (2016-06-03) - Hotfix for downloading new docker binary versions diff --git a/VERSION b/VERSION index 2eda823..308b6fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.1 \ No newline at end of file +1.6.2 \ No newline at end of file diff --git a/scripts/presetup-win.sh b/scripts/presetup-win.sh index b061dfc..7dc96fb 100644 --- a/scripts/presetup-win.sh +++ b/scripts/presetup-win.sh @@ -2,7 +2,10 @@ DOCKER_VERSION=1.11.2 DOCKER_COMPOSE_VERSION=1.7.1 +# These two shouldbe changes together. Always check https://github.com/rprichard/winpty/releases for the current version. WINPTY_VERSION=0.3.1 +CYGWIN_VERSION=2.5.1 +## # Console colors red='\033[0;31m' @@ -47,10 +50,10 @@ if [[ "$B2D_INSTALL_MODE" == "full" ]] || [[ "$B2D_INSTALL_MODE" == "docker" ]] # Install winpty echo-green "Installing winpty (console) v$WINPTY_VERSION..." - curl -sSL -O https://github.com/rprichard/winpty/releases/download/$WINPTY_VERSION/winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz - tar -xf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32.tar.gz - mv winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32/bin/* /usr/local/bin - rm -rf winpty-$WINPTY_VERSION-cygwin-2.4.1-ia32* + curl -sSL -O https://github.com/rprichard/winpty/releases/download/$WINPTY_VERSION/winpty-$WINPTY_VERSION-cygwin-$CYGWIN_VERSION-ia32.tar.gz + tar -xf winpty-$WINPTY_VERSION-cygwin-$CYGWIN_VERSION-ia32.tar.gz + mv winpty-$WINPTY_VERSION-cygwin-$CYGWIN_VERSION-ia32/bin/* /usr/local/bin + rm -rf winpty-$WINPTY_VERSION-cygwin-$CYGWIN_VERSION-ia32* # Git settings echo-green "Adjusting git defaults..."