From f736a248f741c0ce6eb49606edd1296456de201c Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 21 Jul 2015 00:34:59 +0100 Subject: [PATCH 1/2] Added centos to install-all.sh --- install-all.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/install-all.sh b/install-all.sh index 0b1719a4..d98819c7 100755 --- a/install-all.sh +++ b/install-all.sh @@ -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 } +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() { echo @@ -157,6 +169,8 @@ if [ "${OS}" = "Linux" ]; then DIST=debian elif [ -f /etc/os-release ]; then DIST=opensuse + elif [ -f /etc/centos-release ]; then + DIST=centos fi else echo $OS | grep -i cygwin @@ -183,6 +197,11 @@ opensuse) opensuse_prepare sudo /sbin/ldconfig install_profanity ;; +centos) centos_prepare + install_lib_strophe /usr + sudo ldconfig + install_profanity + ;; cygwin) cygwin_prepare cyg_install_lib_strophe cyg_install_profanity From fceec61a2c5cc323b4f7c1a8b4ffbe01b458c781 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 21 Jul 2015 00:39:53 +0100 Subject: [PATCH 2/2] Changed os check ordering in install-all.sh --- install-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-all.sh b/install-all.sh index d98819c7..f302de4d 100755 --- a/install-all.sh +++ b/install-all.sh @@ -167,10 +167,10 @@ if [ "${OS}" = "Linux" ]; then DIST=fedora elif [ -f /etc/debian_version ]; then DIST=debian - elif [ -f /etc/os-release ]; then - DIST=opensuse elif [ -f /etc/centos-release ]; then DIST=centos + elif [ -f /etc/os-release ]; then + DIST=opensuse fi else echo $OS | grep -i cygwin