From 8f0bc28bd4df075cba8a190c67846e90799af8cf Mon Sep 17 00:00:00 2001 From: James Booth Date: Sat, 8 Sep 2012 17:58:42 +0100 Subject: [PATCH] Removed sudo from cygwin install --- install-all.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/install-all.sh b/install-all.sh index bb79e710..5b7f3666 100755 --- a/install-all.sh +++ b/install-all.sh @@ -61,7 +61,6 @@ install_lib_strophe() git clone git://github.com/metajack/libstrophe.git cd libstrophe ./bootstrap.sh - ./bootstrap.sh # second call seems to fix problem on cygwin ./configure make sudo make install @@ -80,6 +79,46 @@ install_profanity() sudo make install } +cyg_install_head_unit() +{ + echo + echo Profanity installer... installing head-unit + echo + git clone git://github.com/boothj5/head-unit.git + cd head-unit + make + make install + + cd .. +} + +cyg_install_lib_strophe() +{ + echo + echo Profanity installer... installing libstrophe + echo + git clone git://github.com/metajack/libstrophe.git + cd libstrophe + ./bootstrap.sh + ./bootstrap.sh # second call seems to fix problem on cygwin + ./configure + make + make install + + cd .. +} + +cyg_install_profanity() +{ + echo + echo Profanity installer... installing Profanity + echo + ./bootstrap.sh + ./configure + make + make install +} + cleanup() { echo @@ -121,14 +160,20 @@ unknown) echo The install script will not work on this OS. exit ;; fedora) fedora_prepare + install_head_unit + install_lib_strophe + install_profanity ;; debian) debian_prepare + install_head_unit + install_lib_strophe + install_profanity ;; cygwin) cygwin_prepare + cyg_install_head_unit + cyg_install_lib_strophe + cyg_install_profanity ;; esac -install_head_unit -install_lib_strophe -install_profanity cleanup