From ee8ec99e0fb5f8852d4ea8445ac4e26f043dc56b Mon Sep 17 00:00:00 2001 From: Lennart Bentz Date: Tue, 6 Oct 2015 20:00:05 +0200 Subject: [PATCH] Add check for existing apt-cyg in cyg_prepare() and extract installation method into separate function cyg_install_apt_cyg() --- install-all.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/install-all.sh b/install-all.sh index bd5093dd..f79c3e88 100755 --- a/install-all.sh +++ b/install-all.sh @@ -63,12 +63,7 @@ cygwin_prepare() echo Profanity installer... installing dependencies echo - wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg - #wget --no-check-certificate https://raw.github.com/boothj5/apt-cyg/master/apt-cyg - #wget http://apt-cyg.googlecode.com/svn/trunk/apt-cyg - chmod +x apt-cyg - mv apt-cyg /usr/local/bin/ - + if ! command -v apt-cyg &>/dev/null; then cyg_install_apt_cyg; fi if [ -n "$CYG_MIRROR" ]; then apt-cyg -m $CYG_MIRROR install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel libgcrypt-devel libreadline-devel libgpgme-devel libtool libuuid-devel else @@ -105,6 +100,18 @@ install_profanity() sudo make install } +cyg_install_apt_cyg() +{ + echo + echo Profanity installer... installing apt-cyg + echo + wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg + #wget --no-check-certificate https://raw.github.com/boothj5/apt-cyg/master/apt-cyg + #wget http://apt-cyg.googlecode.com/svn/trunk/apt-cyg + chmod +x apt-cyg + mv apt-cyg /usr/local/bin/ + +} cyg_install_lib_mesode() { echo