Permalink
Browse files

Revert "Merge pull request #18 from larzconwell/master" due to failin…

…g test on fresh install of Ubuntu.

This reverts commit c842af6, reversing
changes made to d79902e.
  • Loading branch information...
1 parent c842af6 commit 56687f4249b2975594cf5c79b604f66f5d878a85 @joshfng committed Feb 8, 2012
Showing with 15 additions and 34 deletions.
  1. +3 −4 railsready.sh
  2. +6 −15 recipes/centos.sh
  3. +6 −15 recipes/ubuntu.sh
View
@@ -19,7 +19,6 @@ ruby_source_dir_name="ruby-1.9.3-p0"
script_runner=$(whoami)
railsready_path=$(cd && pwd)/railsready
log_file="$railsready_path/install.log"
-railsready_recipes_path="https://raw.github.com/joshfng/railsready/master/recipes"
control_c()
{
@@ -49,7 +48,7 @@ elif [[ $MACHTYPE = *darwin* ]] ; then
if [[ ! -s /Library/Developer/Shared/XcodeTools.plist ]] ; then
echo -e "\nXCode must be installed in order to build required software.\n"
exit 1
- fi
+ fi
else
echo -e "\nRails Ready currently only supports Ubuntu and CentOS and OSX\n"
exit 1
@@ -104,9 +103,9 @@ echo "==> done..."
echo -e "\n=> Downloading and running recipe for $distro...\n"
#Download the distro specific recipe and run it, passing along all the variables as args
if [[ $MACHTYPE = *linux* ]] ; then
- wget --no-check-certificate -O $railsready_path/src/$distro.sh $railsready_recipes_path/$distro.sh && cd $railsready_path/src && bash $distro.sh $ruby_version $ruby_version_string $ruby_source_url $ruby_source_tar_name $ruby_source_dir_name $whichRuby $railsready_path $log_file
+ wget --no-check-certificate -O $railsready_path/src/$distro.sh https://raw.github.com/joshfng/railsready/master/recipes/$distro.sh && cd $railsready_path/src && bash $distro.sh $ruby_version $ruby_version_string $ruby_source_url $ruby_source_tar_name $ruby_source_dir_name $whichRuby $railsready_path $log_file
else
- cd $railsready_path/src && curl -O $railsready_recipes_path/$distro.sh && bash $distro.sh $ruby_version $ruby_version_string $ruby_source_url $ruby_source_tar_name $ruby_source_dir_name $whichRuby $railsready_path $log_file
+ cd $railsready_path/src && curl -O https://raw.github.com/joshfng/railsready/master/recipes/$distro.sh && bash $distro.sh $ruby_version $ruby_version_string $ruby_source_url $ruby_source_tar_name $ruby_source_dir_name $whichRuby $railsready_path $log_file
fi
echo -e "\n==> done running $distro specific commands..."
View
@@ -42,20 +42,11 @@ sudo yum install -y gcc-c++ patch \
echo "==> done..."
# Install imagemagick
-# Convert is a part of imagemagick
-if [ ! -f $(which convert) ]; then
- echo -e "\n=> Installing imagemagick (this may take a while)..."
- sudo yum install -y ImageMagick >> $log_file 2>&1
- echo "==> done..."
-else
- echo "==> ImageMagick already installed..."
-fi
+echo -e "\n=> Installing imagemagick (this may take a while)..."
+sudo yum install -y ImageMagick >> $log_file 2>&1
+echo "==> done..."
# Install Git
-if [ ! -f $(which git) ]; then
- echo -e "\n=> Installing git..."
- sudo yum install -y git >> $log_file 2>&1
- echo "==> done..."
-else
- echo "==> Git already installed..."
-fi
+echo -e "\n=> Installing git..."
+sudo yum install -y git >> $log_file 2>&1
+echo "==> done..."
View
@@ -52,20 +52,11 @@ sudo $pm -y install libsqlite3-0 sqlite3 libsqlite3-dev libmysqlclient16-dev lib
echo "==> done..."
# Install imagemagick
-# Convert is a part of imagemagick
-if [ ! -f $(which convert) ]; then
- echo -e "\n=> Installing imagemagick (this may take a while)..."
- sudo $pm -y install imagemagick libmagick9-dev >> $log_file 2>&1
- echo "==> done..."
-else
- echo "==> ImageMagick already installed..."
-fi
+echo -e "\n=> Installing imagemagick (this may take a while)..."
+sudo $pm -y install imagemagick libmagick9-dev >> $log_file 2>&1
+echo "==> done..."
# Install git-core
-if [ ! -f $(which git) ]; then
- echo -e "\n=> Installing git..."
- sudo $pm -y install git-core >> $log_file 2>&1
- echo "==> done..."
-else
- echo "==> Git already installed..."
-fi
+echo -e "\n=> Installing git..."
+sudo $pm -y install git-core >> $log_file 2>&1
+echo "==> done..."

0 comments on commit 56687f4

Please sign in to comment.