Skip to content

Commit

Permalink
Revert "[build/setup.sh] Add libsodium setup to install flow. NOTE: f…
Browse files Browse the repository at this point in the history
…or some reason we hang on pip install -e ."

This reverts commit 4f9e5e2.
  • Loading branch information
dlitz authored and Charles Gruenwald committed Sep 3, 2014
1 parent 5f21133 commit 3593515
Showing 1 changed file with 1 addition and 37 deletions.
38 changes: 1 addition & 37 deletions setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

set -e

Expand Down Expand Up @@ -34,42 +34,6 @@ color '36;1' "
https://www.github.com/inboxapp/inbox
"

if [ ! -f "/usr/include/sodium.h" ]; then
color '35;1' 'Installing sodium crypto library'
mkdir -p setup
cd setup
libsodium=libsodium-0.4.3.tar.gz
if [ ! -f $libsodium ]; then
color '34;1' ' > Downloading...'
wget -q -O "$libsodium" https://download.libsodium.org/libsodium/releases/$libsodium
fi

color '34;1' ' > Checking the hash...'
if ! shasum -a 256 -s -c << EOF
599ce19ae6ace2d30aee353b931088f720713c4e1d0b2918ed46de1914fb6042 *$libsodium
EOF
then
color '31;1' " Error verifying $libsodium hash!"
exit 1
else
color '32;1' " $libsodium hash ok."
fi

tar -zxf $libsodium
pushd `pwd`
cd ${libsodium//.tar.gz/}
color '34;1' ' > Configuring...'
./configure --prefix=/usr --quiet
color '34;1' ' > Building...'
make -s > /tmp/$libsodium.build.out
color '34;1' ' > Installing...'
make install -s > /tmp/$libsodium.build.out
popd
color '34;1' ' > Cleaning up'
rm -fr setup $libsodium
color '34;1' ' > libsodium installation done.'
fi

color '35;1' 'Updating packages...'
apt-get update
apt-get -y install python-software-properties
Expand Down

0 comments on commit 3593515

Please sign in to comment.