From 7a3cd1750e9b35a9126bf9e80fbee73f07c10f95 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Fri, 7 Dec 2018 17:24:55 +0000 Subject: [PATCH] Move windows to shell --- .linux.sh | 1 + .travis.yml | 4 ++-- .windows.bat | 3 --- .windows.sh | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 .linux.sh delete mode 100644 .windows.bat create mode 100644 .windows.sh diff --git a/.linux.sh b/.linux.sh old mode 100644 new mode 100755 index 2ee69a0..8eafc62 --- a/.linux.sh +++ b/.linux.sh @@ -1,2 +1,3 @@ +#!/bin/sh curl -sSL https://get.haskellstack.org/ | sh export PATH=$HOME/.local/bin:$PATH diff --git a/.travis.yml b/.travis.yml index a5d4b5d..f26edb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,8 @@ addons: - npm before_install: - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then .windows.bat; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.linux.sh; fi; + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install haskell-stack nodejs; /C/ProgramData/chocolatey/bin/RefreshEnv.cmd; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.linux.sh; fi - mkdir -p haskell-ide-engine - cd $HOME/haskell-ide-engine - git init diff --git a/.windows.bat b/.windows.bat deleted file mode 100644 index b59bf0b..0000000 --- a/.windows.bat +++ /dev/null @@ -1,3 +0,0 @@ -choc install haskell-stack nodejs 7zip -# export PATH=/C/ProgramData/chocolatey/bin:$PATH -# refreshenv diff --git a/.windows.sh b/.windows.sh new file mode 100644 index 0000000..d774a27 --- /dev/null +++ b/.windows.sh @@ -0,0 +1,2 @@ +choco install haskell-stack nodejs 7zip +/C/ProgramData/chocolatey/bin/RefreshEnv.cmd -- 2.30.2