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:
commit
36bd583d95
@ -63,12 +63,7 @@ cygwin_prepare()
|
|||||||
echo Profanity installer... installing dependencies
|
echo Profanity installer... installing dependencies
|
||||||
echo
|
echo
|
||||||
|
|
||||||
wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg
|
if ! command -v apt-cyg &>/dev/null; then cyg_install_apt_cyg; fi
|
||||||
#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/
|
|
||||||
|
|
||||||
if [ -n "$CYG_MIRROR" ]; then
|
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
|
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
|
||||||
else
|
else
|
||||||
@ -105,6 +100,18 @@ install_profanity()
|
|||||||
sudo make install
|
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()
|
cyg_install_lib_mesode()
|
||||||
{
|
{
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user