Generate the distribution file under 'dist' directory.

diff --git a/.gitignore b/.gitignore
index e0a60c9..e1d2ba4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 .DS_Store
-atom-shell.zip
-version
 /build/
 /dist/
 /frameworks/

diff --git a/script/create-dist.py b/script/create-dist.py
index 74cb369..3d4a616 100755 (executable)
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -84,7 +84,7 @@ def create_version():
 
 def create_zip():
   print "Zipping distribution..."
-  zip_file = os.path.join(SOURCE_ROOT, 'atom-shell.zip')
+  zip_file = os.path.join(SOURCE_ROOT, 'dist', 'atom-shell.zip')
   safe_unlink(zip_file)
 
   with scoped_cwd(DIST_DIR):

diff --git a/script/upload.py b/script/upload.py
index 7d99ad6..05dc8b8 100755 (executable)
--- a/script/upload.py
+++ b/script/upload.py
@@ -11,6 +11,7 @@ from lib.util import *
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
 
 
 def main():
@@ -49,11 +50,11 @@ def dist_newer_than_head():
 
 
 def upload():
-  os.chdir(SOURCE_ROOT)
+  os.chdir(DIST_DIR)
   bucket, access_key, secret_key = s3_config()
 
   version = get_atom_shell_version()
-  s3put(bucket, access_key, secret_key, SOURCE_ROOT,
+  s3put(bucket, access_key, secret_key, DIST_DIR,
         'atom-shell/{0}'.format(version), glob.glob('atom-shell*.zip'))
 
   update_version(bucket, access_key, secret_key)