From c72500310b1fcdf84e2e6978b76b06c7680692d9 Mon Sep 17 00:00:00 2001 From: marxzuckerburg Date: Fri, 2 Oct 2020 20:25:59 +0100 Subject: [PATCH] win installer fix --- script/install | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/script/install b/script/install index f15b796..f334cb2 100644 --- a/script/install +++ b/script/install @@ -215,16 +215,24 @@ fi if [ "$machine" = "Cygwin" ] || [ "$machine" = "MinGw" ] then - arch="$(uname -m)" - if [ "$arch" = "x86_64" ] + # arch="$(uname -m)" + # if [ "$arch" = "x86_64" ] + # then + # curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86_64.exe -o miniconda.exe + # else + # curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86.exe -o miniconda.exe + # fi + + # ./miniconda.exe -b -f -p "$path_conda" + # # rm miniconda.exe + + if [ ! -f "miniconda.sh" ] then - curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86_64.exe -o miniconda.exe - else - curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Windows-x86.exe -o miniconda.exe + curl https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.3-Linux-x86_64.sh -o miniconda.sh + chmod +x miniconda.sh fi + ./miniconda.sh -b -f -p "$path_conda" - ./miniconda.exe -b -f -p "$path_conda" - # rm miniconda.exe ### install themis from source if [ ! -f "/usr/local/lib/libthemis.so" ] @@ -243,7 +251,7 @@ then #mv themis-master themis cd themis-master make - sudo make install + make install fi fi