Merge pull request #81 from blinkreaction/fix-wympty-url

Cygwin version is used in wimpty release url.Add variable CYGWIN_VERSION
lmakarov · Jun 23, 2016 · 0031e16 · 0031e16
2 parents eeade7b + e4d84c4
commit 0031e16
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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..."