Merge branch 'master' into pr/205

# Conflicts:
#	packages/openssl_devel.rb

README.md

@@ -23,7 +23,7 @@ Installation
 ------------
 Open the terminal with Ctrl+Alt+T and type `shell`.
 
-If this command returns `Unknown command: 'wget'` please have a second look at the prerequisites and make sure your Chromebook is in developer mode.
+If this command returns `Unknown command: 'shell'` please have a second look at the prerequisites and make sure your Chromebook is in developer mode.
 
 Then download and run the installation script
 

install.sh

@@ -10,7 +10,6 @@ CREW_BREW_DIR=$CREW_PREFIX/tmp/crew/
 CREW_DEST_DIR=$CREW_BREW_DIR/dest
 CREW_PACKAGES_PATH=$CREW_LIB_PATH/packages
 
-user=$(whoami)
 architecture=$(uname -m)
 
 if [ $EUID -eq 0 ]; then
@@ -24,12 +23,9 @@ if [ $architecture != "i686" ] && [ $architecture != "x86_64" ]; then
 fi
 
 #prepare directories
-sudo mkdir -p $CREW_LIB_PATH && sudo chown -R $USER:$USER $CREW_LIB_PATH
-sudo mkdir -p $CREW_CONFIG_PATH && sudo chown -R $USER:$USER $CREW_CONFIG_PATH
-sudo mkdir -p $CREW_CONFIG_PATH/meta && sudo chown -R $USER:$USER $CREW_CONFIG_PATH/meta
-sudo mkdir -p $CREW_BREW_DIR && sudo chown -R $USER:$USER $CREW_BREW_DIR
-sudo mkdir -p $CREW_DEST_DIR && sudo chown -R $USER:$USER $CREW_DEST_DIR
-sudo mkdir -p $CREW_PACKAGES_PATH && sudo chown -R $USER:$USER $CREW_PACKAGES_PATH
+for dir in $CREW_LIB_PATH $CREW_CONFIG_PATH $CREW_CONFIG_PATH/meta $CREW_BREW_DIR $CREW_DEST_DIR $CREW_PACKAGES_PATH; do
+  sudo mkdir -p $dir && sudo chown -R $USER:$USER $dir
+done
 
 #cd into the brew directory, everything will happen there
 cd $CREW_BREW_DIR
@@ -39,16 +35,16 @@ echo "Downloading ruby..."
 
 case "$architecture" in
 "i686")
-  link='https://dl.dropboxusercontent.com/s/tufbuqcn80ubypx/ruby-2.0.0p247-chromeos-i686.tar.gz?token_hash=AAGu_5wuqZe2eDOkfL5oh4esQ8HAZJIvbMG7GplnQrSa3g&dl=1'
+  link='https://dl.dropboxusercontent.com/s/tufbuqcn80ubypx/ruby-2.0.0p247-chromeos-i686.tar.gz'
   tarname='ruby-2.0.0p247-chromeos-'$architecture'.tar.gz'
   ;;
 "x86_64")
-  link='https://dl.dropboxusercontent.com/s/3dw5ue5vhf5nj8k/ruby-2.0.0-p247-chromeos1-chromeos-x86_64.tar.gz?dl=1&token_hash=AAHYJ-WOExuc2f4mKN3pDHUOlTMnt3h-rBosLmYr2Gvy7w'
+  link='https://dl.dropboxusercontent.com/s/3dw5ue5vhf5nj8k/ruby-2.0.0-p247-chromeos1-chromeos-x86_64.tar.gz'
   tarname='ruby-2.0.0-p247-chromeos1-chromeos-'$architecture'.tar.gz'
   ;;
 esac
 
-wget --continue --no-check-certificate --content-disposition $link -O $tarname
+wget -c $link -O $tarname
 
 #extract and install ruby
 echo "Extracting ruby (this may take a while)..."
@@ -60,17 +56,16 @@ mv ./filelist $CREW_CONFIG_PATH/meta/ruby.filelist
 
 #download, prepare and install chromebrew
 cd $CREW_LIB_PATH
-wget -N --continue --no-check-certificate $URL/crew
+wget -N -c $URL/crew
 chmod +x crew
 sudo ln -s `pwd`/crew $CREW_PREFIX/bin
 #install crew library
 mkdir $CREW_LIB_PATH/lib && cd $CREW_LIB_PATH/lib
-wget -N --continue --no-check-certificate $URL/lib/package.rb
-wget -N --continue --no-check-certificate $URL/lib/package_helpers.rb
+wget -N -c $URL/lib/package.rb
+wget -N -c $URL/lib/package_helpers.rb
 #create the device.json file
 cd $CREW_CONFIG_PATH
-touch device.json
-echo "{" > device.json
+echo '{' > device.json
 echo '  "architecture": "'$architecture'",' >> device.json
 echo '  "installed_packages": [' >> device.json
 echo '    {' >> device.json
@@ -78,35 +73,19 @@ echo '      "name": "ruby",' >> device.json
 echo '      "version": "2.0.0p247"' >> device.json
 echo '    }' >> device.json
 echo '  ]' >> device.json
-echo "}" >> device.json
+echo '}' >> device.json
 
 #download git and its dependencies .rb package files
 cd $CREW_PACKAGES_PATH
-wget -N --continue --no-check-certificate $URL/packages/git.rb
-wget -N --continue --no-check-certificate $URL/packages/zlibpkg.rb
-wget -N --continue --no-check-certificate $URL/packages/libssh2.rb
-wget -N --continue --no-check-certificate $URL/packages/perl.rb
-wget -N --continue --no-check-certificate $URL/packages/curl.rb
-wget -N --continue --no-check-certificate $URL/packages/expat.rb
-wget -N --continue --no-check-certificate $URL/packages/gettext.rb
-wget -N --continue --no-check-certificate $URL/packages/python.rb
-wget -N --continue --no-check-certificate $URL/packages/readline.rb
-wget -N --continue --no-check-certificate $URL/packages/ruby.rb
-wget -N --continue --no-check-certificate $URL/packages/buildessential.rb
-wget -N --continue --no-check-certificate $URL/packages/gcc.rb
-wget -N --continue --no-check-certificate $URL/packages/binutils.rb
-wget -N --continue --no-check-certificate $URL/packages/make.rb
-wget -N --continue --no-check-certificate $URL/packages/mpc.rb
-wget -N --continue --no-check-certificate $URL/packages/mpfr.rb
-wget -N --continue --no-check-certificate $URL/packages/gmp.rb
-wget -N --continue --no-check-certificate $URL/packages/glibc.rb
-wget -N --continue --no-check-certificate $URL/packages/linuxheaders.rb
+for file in git zlibpkg libssh2 perl curl expat gettext python readline ruby buildessential gcc binutils make mpc mpfr gmp glibc linuxheaders; do
+  wget -N -c $URL/packages/$file.rb
+done
 
 #install readline for ruby
-(echo y;) | crew install readline
+echo y | crew install readline
 
 #install git
-(echo y;) | crew install git
+echo y | crew install git
 
 #Making GCC act like CC (For some npm packages out there)
 sudo ln -s /usr/local/bin/gcc /usr/local/bin/cc

packages/elixir.rb

+require 'package'
+
+class Elixir < Package
+  version '1.3.1'
+  depends_on 'erlang'
+
+  source_url 'https://github.com/elixir-lang/elixir/archive/v1.3.1.tar.gz'
+  source_sha1 '29dc1b4da5e051ad71ad84b6886d7c184e4b9add'
+
+  def self.build
+    system 'make clean test'
+  end
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end

packages/erlang.rb

+require 'package'
+
+class Erlang < Package
+  version '19.0'
+  source_url 'http://www.erlang.org/download/otp_src_19.0.tar.gz'
+  source_sha1 '3be958b529de4be19d77eb77f587a76210b43bfd'
+
+  def self.build
+    system 'export ERL_OTP=`pwd`'
+    system './configure --prefix=/usr/local'
+    system 'make'
+  end
+
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end

packages/libevent.rb

@@ -4,9 +4,10 @@ class Libevent < Package                                            	# name the
   version '2.0.22'                                               	                                      # software version
   source_url 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz'     # software source tarball url
   source_sha1 'a586882bc93a208318c70fc7077ed8fca9862864'          	# source tarball sha1 sum
+  depends_on 'openssl_devel'
   
   def self.build                                                  # self.build contains commands needed to build the software from source
-    system "./configure --disable-openssl"
+    system "./configure"
     system "make"                                                 # ordered chronologically
   end
   

packages/libsigsegv.rb

@@ -2,7 +2,7 @@ require 'package'
 
 class Libsigsegv < Package
   version '2.10'
-  source_url 'ftp://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.10.tar.gz'
+  source_url 'ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.10.tar.gz'
   source_sha1 'b75a647a9ebda70e7a3b33583efdd550e0eac094'
 
   def self.build

packages/openssl_devel.rb

@@ -10,10 +10,17 @@ class Openssl_devel < Package
   version '1.0.2f'
 
 #  chromeos wget can't do proper ssl negotiation with this server
+<<<<<<< HEAD
 #  source_url 'https://www.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz'
 #  so use their ftp server.  
   source_url 'ftp://ftp.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz'
   source_sha1 '36af23887402a5ea4ebef91df8e61654906f58f2'
+=======
+#  source_url 'https://www.openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz'
+#  so use their ftp server.  
+  source_url 'ftp://ftp.openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz'
+  source_sha1 '2047c592a6e5a42bd37970bdb4a931428110a927'
+>>>>>>> master
 
   depends_on 'perl'
 

packages/python27.rb

@@ -7,6 +7,7 @@ class Python27 < Package
 
   depends_on 'bz2'
   depends_on 'ncurses'
+  depends_on 'openssl_devel'
 
   def self.build                                                  # self.build contains commands needed to build the software from source
     system "./configure --prefix=/usr/local CPPFLAGS=\"-I/usr/local/include -I/usr/local/include/ncurses\" LDFLAGS=\"-L/usr/local/lib\" CFLAGS=\" -fPIC\""

packages/python34.rb

@@ -4,6 +4,8 @@ class Python34 < Package
   version '3.4.1'
   source_url 'https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz'     # software source tarball url
   source_sha1 'e8c1bd575a6ccc2a75f79d9d094a6a29d3802f5d'          	# source tarball sha1 sum
+
+  depends_on 'openssl_devel'
   
   def self.build                                                  # self.build contains commands needed to build the software from source
     system "./configure"

packages/tmux.rb

@@ -7,6 +7,8 @@ class Tmux < Package                                            	# name the pack
   
   depends_on 'readline'                                            # software dependencies
   depends_on 'libevent'
+  # does this really depend on openssl?  or just on libevent that depends on openssl
+  depends_on 'openssl_devel'
   depends_on 'ncurses'
   
   def self.build                                                  # self.build contains commands needed to build the software from source