1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-07-21 00:44:39 +01:00
commit 04acc17ee3

View File

@ -47,6 +47,18 @@ opensuse_prepare()
sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool libuuid-devel sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool libuuid-devel
} }
centos_prepare()
{
echo
echo Profanity installer...installing dependencies
echo
sudo yum -y install epel-release
sudo yum -y install git
sudo yum -y install gcc autoconf automake cmake
sudo yum -y install openssl-devel expat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool libuuid-devel gpgme-devel
}
cygwin_prepare() cygwin_prepare()
{ {
echo echo
@ -155,6 +167,8 @@ if [ "${OS}" = "Linux" ]; then
DIST=fedora DIST=fedora
elif [ -f /etc/debian_version ]; then elif [ -f /etc/debian_version ]; then
DIST=debian DIST=debian
elif [ -f /etc/centos-release ]; then
DIST=centos
elif [ -f /etc/os-release ]; then elif [ -f /etc/os-release ]; then
DIST=opensuse DIST=opensuse
fi fi
@ -183,6 +197,11 @@ opensuse) opensuse_prepare
sudo /sbin/ldconfig sudo /sbin/ldconfig
install_profanity install_profanity
;; ;;
centos) centos_prepare
install_lib_strophe /usr
sudo ldconfig
install_profanity
;;
cygwin) cygwin_prepare cygwin) cygwin_prepare
cyg_install_lib_strophe cyg_install_lib_strophe
cyg_install_profanity cyg_install_profanity