From e3ead65d03ff34301cd90166ce950d61ad13c366 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 6 Aug 2012 03:17:01 -0400
Subject: [PATCH] cleanup

---
 build-2.7.3.sh                         | 14 --------------
 build.sh                               |  2 +-
 formula/python-2.7.0                   | 20 ++++++++++++++++++++
 build-2.7.1.sh => formula/python-2.7.1 | 12 +++++++++---
 build-2.7.2.sh => formula/python-2.7.2 | 12 +++++++++---
 formula/python-2.7.3                   |  6 +++++-
 formula/todo/python-2.7.0              |  0
 formula/todo/python-2.7.1              |  0
 formula/todo/python-2.7.2              |  0
 parts/sqlite                           |  6 +++++-
 10 files changed, 49 insertions(+), 23 deletions(-)
 delete mode 100755 build-2.7.3.sh
 create mode 100644 formula/python-2.7.0
 rename build-2.7.1.sh => formula/python-2.7.1 (52%)
 mode change 100755 => 100644
 rename build-2.7.2.sh => formula/python-2.7.2 (52%)
 mode change 100755 => 100644
 delete mode 100644 formula/todo/python-2.7.0
 delete mode 100644 formula/todo/python-2.7.1
 delete mode 100644 formula/todo/python-2.7.2

diff --git a/build-2.7.3.sh b/build-2.7.3.sh
deleted file mode 100755
index 65be590..0000000
--- a/build-2.7.3.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Usage: $ build.sh <output-dir>
-
-SOURCE_TARBALL='http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2'
-curl $SOURCE_TARBALL | tar jx
-mv Python-2.7.3 src
-cd src
-
-./configure --prefix=$(pwd)/../python
-make
-make install
-
-cd ..
-tar cjf python-2.7.3.tar.bz2 python/
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 93713f7..97ca3a4 100755
--- a/build.sh
+++ b/build.sh
@@ -63,5 +63,5 @@ fi
 $(pwd)/formula/$FORMULA $PREFIX_PATH | indent
 
 if [ "$ARCHIVE" ]; then
-    tar cjf $ARCHIVE $PREFIX_PATH/
+    tar cjf $ARCHIVE $PREFIX_PATH
 fi
\ No newline at end of file
diff --git a/formula/python-2.7.0 b/formula/python-2.7.0
new file mode 100644
index 0000000..0622b54
--- /dev/null
+++ b/formula/python-2.7.0
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Options: <output-dir>
+
+OUT_PREFIX=$1
+
+echo "Building SQLite..."
+./parts/sqlite $OUT_PREFIX
+
+echo "Building Python..."
+SOURCE_TARBALL='http://www.python.org/ftp/python/2.7/Python-2.7.tar.bz2'
+curl $SOURCE_TARBALL | tar jx
+mv Python-2.7 src
+cd src
+
+./configure --prefix=$OUT_PREFIX
+make
+make install
+
+cd ..
+rm -fr src
\ No newline at end of file
diff --git a/build-2.7.1.sh b/formula/python-2.7.1
old mode 100755
new mode 100644
similarity index 52%
rename from build-2.7.1.sh
rename to formula/python-2.7.1
index a8e8dea..1f32560
--- a/build-2.7.1.sh
+++ b/formula/python-2.7.1
@@ -1,14 +1,20 @@
 #!/usr/bin/env bash
-# Usage: $ build.sh <output-dir
+# Options: <output-dir>
 
+OUT_PREFIX=$1
+
+echo "Building SQLite..."
+./parts/sqlite $OUT_PREFIX
+
+echo "Building Python..."
 SOURCE_TARBALL='http://www.python.org/ftp/python/2.7.1/Python-2.7.1.tar.bz2'
 curl $SOURCE_TARBALL | tar jx
 mv Python-2.7.1 src
 cd src
 
-./configure --prefix=$(pwd)/../python
+./configure --prefix=$OUT_PREFIX
 make
 make install
 
 cd ..
-tar cjf python-2.7.1.tar.bz2 python/
\ No newline at end of file
+rm -fr src
\ No newline at end of file
diff --git a/build-2.7.2.sh b/formula/python-2.7.2
old mode 100755
new mode 100644
similarity index 52%
rename from build-2.7.2.sh
rename to formula/python-2.7.2
index 87705c8..86e07a3
--- a/build-2.7.2.sh
+++ b/formula/python-2.7.2
@@ -1,14 +1,20 @@
 #!/usr/bin/env bash
-# Usage: $ build.sh <output-dir
+# Options: <output-dir>
 
+OUT_PREFIX=$1
+
+echo "Building SQLite..."
+./parts/sqlite $OUT_PREFIX
+
+echo "Building Python..."
 SOURCE_TARBALL='http://www.python.org/ftp/python/2.7.2/Python-2.7.2.tar.bz2'
 curl $SOURCE_TARBALL | tar jx
 mv Python-2.7.2 src
 cd src
 
-./configure --prefix=$(pwd)/../python
+./configure --prefix=$OUT_PREFIX
 make
 make install
 
 cd ..
-tar cjf python-2.7.2.tar.bz2 python/
\ No newline at end of file
+rm -fr src
\ No newline at end of file
diff --git a/formula/python-2.7.3 b/formula/python-2.7.3
index 6f15851..54a3286 100755
--- a/formula/python-2.7.3
+++ b/formula/python-2.7.3
@@ -6,6 +6,7 @@ OUT_PREFIX=$1
 echo "Building SQLite..."
 ./parts/sqlite $OUT_PREFIX
 
+echo "Building Python..."
 SOURCE_TARBALL='http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2'
 curl $SOURCE_TARBALL | tar jx
 mv Python-2.7.3 src
@@ -13,4 +14,7 @@ cd src
 
 ./configure --prefix=$OUT_PREFIX
 make
-make install
\ No newline at end of file
+make install
+
+cd ..
+rm -fr src
\ No newline at end of file
diff --git a/formula/todo/python-2.7.0 b/formula/todo/python-2.7.0
deleted file mode 100644
index e69de29..0000000
diff --git a/formula/todo/python-2.7.1 b/formula/todo/python-2.7.1
deleted file mode 100644
index e69de29..0000000
diff --git a/formula/todo/python-2.7.2 b/formula/todo/python-2.7.2
deleted file mode 100644
index e69de29..0000000
diff --git a/parts/sqlite b/parts/sqlite
index e61a6be..63270b5 100755
--- a/parts/sqlite
+++ b/parts/sqlite
@@ -11,4 +11,8 @@ mv sqlite-autoconf-3070900 sqlite
 cd sqlite
 ./configure --prefix=$OUT_PREFIX
 make
-make install
\ No newline at end of file
+make install
+
+# Cleanup
+cd ..
+rm -fr sqlite
\ No newline at end of file