Removed g++ and head-unit from dependencies in install-all.sh

This commit is contained in:
James Booth
2012-12-30 23:29:06 +00:00
parent ab535d5250
commit 81ffb06ee4

View File

@@ -10,7 +10,7 @@ debian_prepare()
echo echo
echo Profanity installer... installing dependencies echo Profanity installer... installing dependencies
echo echo
sudo apt-get -y install g++ git autoconf libssl-dev libexpat1-dev libncurses5-dev libglib2.0-dev libnotify-dev libcurl3-dev sudo apt-get -y install git autoconf libssl-dev libexpat1-dev libncurses5-dev libglib2.0-dev libnotify-dev libcurl3-dev
} }
@@ -22,7 +22,7 @@ fedora_prepare()
ARCH=`arch` ARCH=`arch`
sudo yum -y install gcc gcc-c++ git autoconf automake openssl-devel.$ARCH expat-devel.$ARCH ncurses-devel.$ARCH glib2-devel.$ARCH libnotify-devel.$ARCH libcurl-devel.$ARCH sudo yum -y install gcc git autoconf automake openssl-devel.$ARCH expat-devel.$ARCH ncurses-devel.$ARCH glib2-devel.$ARCH libnotify-devel.$ARCH libcurl-devel.$ARCH
} }
cygwin_prepare() cygwin_prepare()
@@ -37,24 +37,10 @@ cygwin_prepare()
apt-cyg install make gcc automake autoconf pkg-config openssl-devel expat zlib-devel libncurses-devel libncurses-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel apt-cyg install make gcc automake autoconf pkg-config openssl-devel expat zlib-devel libncurses-devel libncurses-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel
ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe
ln -s /usr/bin/g++-3.exe /usr/bin/g++.exe
export LIBRARY_PATH=/usr/local/lib/ export LIBRARY_PATH=/usr/local/lib/
} }
install_head_unit()
{
echo
echo Profanity installer... installing head-unit
echo
git clone git://github.com/boothj5/head-unit.git
cd head-unit
make
sudo make install
cd ..
}
install_lib_strophe() install_lib_strophe()
{ {
echo echo
@@ -80,19 +66,6 @@ install_profanity()
sudo make install 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() cyg_install_lib_strophe()
{ {
echo echo
@@ -125,9 +98,6 @@ cleanup()
echo Profanity installer... cleaning up echo Profanity installer... cleaning up
echo echo
echo Removing head-unit repository...
rm -rf head-unit
echo Removing libstrophe repository... echo Removing libstrophe repository...
rm -rf libstrophe rm -rf libstrophe
@@ -160,17 +130,14 @@ unknown) echo The install script will not work on this OS.
exit exit
;; ;;
fedora) fedora_prepare fedora) fedora_prepare
install_head_unit
install_lib_strophe install_lib_strophe
install_profanity install_profanity
;; ;;
debian) debian_prepare debian) debian_prepare
install_head_unit
install_lib_strophe install_lib_strophe
install_profanity install_profanity
;; ;;
cygwin) cygwin_prepare cygwin) cygwin_prepare
cyg_install_head_unit
cyg_install_lib_strophe cyg_install_lib_strophe
cyg_install_profanity cyg_install_profanity
;; ;;