about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-11-20 23:43:54 +0000
committerJames Booth <boothj5@gmail.com>2013-11-20 23:43:54 +0000
commitff939f13bead348899fcf02ad59a78dcf86d552f (patch)
treea21754fab3662997133fdfba1d11c03d761d7ced
parent8c97658b8d1f7a10f146e33ca3dc5a7ff2aa3527 (diff)
parentbdb8ea3f089da782bde114447062c10f76f82716 (diff)
downloadprofani-tty-ff939f13bead348899fcf02ad59a78dcf86d552f.tar.gz
Merge branch 'master' into refactor
-rwxr-xr-xinstall-all.sh25
1 files changed, 23 insertions, 2 deletions
diff --git a/install-all.sh b/install-all.sh
index 0e8eb195..42deaf1a 100755
--- a/install-all.sh
+++ b/install-all.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+STATUS=development
+
 debian_prepare()
 {
     echo
@@ -10,7 +12,7 @@ debian_prepare()
     echo
     echo Profanity installer... installing dependencies
     echo
-    sudo apt-get -y install git autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev
+    sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev
 
 }
 
@@ -36,7 +38,13 @@ cygwin_prepare()
     chmod +x apt-cyg
     mv apt-cyg /usr/local/bin/
 
-    apt-cyg install make gcc automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncurses-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel
+    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
+    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
+
+    fi
+
     ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe
 
     export LIBRARY_PATH=/usr/local/lib/
@@ -62,6 +70,9 @@ install_profanity()
     echo
     echo Profanity installer... installing Profanity
     echo
+    if [ "${STATUS}" = "development" ]; then
+        ./bootstrap.sh
+    fi
     ./configure
     make
     sudo make install
@@ -88,6 +99,9 @@ cyg_install_profanity()
     echo
     echo Profanity installer... installing Profanity
     echo
+    if [ "${STATUS}" = "development" ]; then
+        ./bootstrap.sh
+    fi
     ./configure
     make
     make install
@@ -109,6 +123,13 @@ cleanup()
     echo
 }
 
+while getopts m: opt
+do
+    case "$opt" in
+        m) CYG_MIRROR=$OPTARG;;
+    esac
+done
+
 OS=`uname -s`
 DIST=unknown