diff --git a/Makefile.am b/Makefile.am index 3e4473c3..754e2deb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -186,7 +186,7 @@ themes_sources = themes/* icons_sources = icons/* -script_sources = bootstrap.sh configure-debug install-all.sh +script_sources = bootstrap.sh configure-debug man_sources = docs/profanity.1 diff --git a/configure.ac b/configure.ac index 5c26bbca..5c20b9ff 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AS_CASE([$host_os], [cygwin], [PLATFORM="cygwin"], [PLATFORM="nix"]) -PACKAGE_STATUS="development" +PACKAGE_STATUS="release" ### Get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then diff --git a/install-all.sh b/install-all.sh deleted file mode 100755 index 37e3c9de..00000000 --- a/install-all.sh +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/bash - -set -o errtrace - -STATUS=development - -error_handler() -{ - ERR_CODE=$? - echo "Error $ERR_CODE with command '$BASH_COMMAND' on line ${BASH_LINENO[0]}. Exiting." - exit $ERR_CODE - -} - -trap error_handler ERR - -debian_prepare() -{ - echo - echo Profanity installer ... updating apt repositories - echo - sudo apt-get update - - echo - echo Profanity installer... installing dependencies - echo - sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libreadline-dev libtool libgpgme11-dev libgtk2.0-dev autoconf-archive - -} - -fedora_prepare() -{ - echo - echo Profanity installer... installing dependencies - echo - - sudo dnf -y install gcc git autoconf automake openssl-devel expat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel readline-devel libtool gpgme-devel gtk2-devel autoconf-archive -} - -opensuse_prepare() -{ - echo - echo Profanity installer...installing dependencies - echo - 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 libgpgme-devel autoconf-archive -} - -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 gpgme-devel autoconf-archive -} - -cygwin_prepare() -{ - echo - echo Profanity installer... installing dependencies - echo - - 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 libpcre-devel libisl10 libcloog-isl4 autoconf-archive - else - apt-cyg 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 libpcre-devel libisl10 libcloog-isl4 autoconf-archive - - fi -} - -install_lib_mesode() -{ - echo - echo Profanity installer... installing libmesode - echo - git clone https://github.com/boothj5/libmesode.git - cd libmesode - ./bootstrap.sh - ./configure --prefix=$1 - make - sudo make install - - cd .. -} - -install_profanity() -{ - echo - echo Profanity installer... installing Profanity - echo - if [ "${STATUS}" = "development" ]; then - ./bootstrap.sh - fi - ./configure - make - 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 - echo Profanity installer... installing libmesode - echo - git clone https://github.com/boothj5/libmesode.git - cd libmesode - ./bootstrap.sh - ./bootstrap.sh # second call seems to fix problem on cygwin - ./configure --prefix=/usr - make - make install - - cd .. -} - -cyg_install_profanity() -{ - echo - echo Profanity installer... installing Profanity - echo - if [ "${STATUS}" = "development" ]; then - ./bootstrap.sh - fi - ./configure - make - make install -} - -cleanup() -{ - echo - echo Profanity installer... cleaning up - echo - - echo Removing libmesode repository... - rm -rf libmesode - - echo - echo Profanity installer... complete! - echo - echo Type \'profanity\' to run. - echo -} - -while getopts m: opt -do - case "$opt" in - m) CYG_MIRROR=$OPTARG;; - esac -done - -OS=`uname -s` -DIST=unknown - -if [ "${OS}" = "Linux" ]; then - if [ -f /etc/fedora-release ]; then - DIST=fedora - elif [ -f /etc/debian_version ]; then - DIST=debian - elif [ -f /etc/centos-release ]; then - DIST=centos - elif [ -f /etc/os-release ]; then - DIST=opensuse - fi -else - echo $OS | grep -i cygwin - if [ "$?" -eq 0 ]; then - DIST=cygwin - fi -fi - -case "$DIST" in -unknown) echo The install script will not work on this OS. - echo Try a manual install instead. - exit - ;; -fedora) fedora_prepare - install_lib_mesode /usr - install_profanity - ;; -debian) debian_prepare - install_lib_mesode /usr - install_profanity - ;; -opensuse) opensuse_prepare - install_lib_mesode /usr/local - sudo /sbin/ldconfig - install_profanity - ;; -centos) centos_prepare - install_lib_mesode /usr - sudo ldconfig - install_profanity - ;; -cygwin) cygwin_prepare - cyg_install_lib_mesode - cyg_install_profanity - ;; -esac - -cleanup