From d7f95a481c28bb1ef55bb602f02d15aa04759c78 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 17 Aug 2012 11:53:51 -0700
Subject: [PATCH] mason.release.archive: fix extension name on release
 binaries.

---
 .../mason/release/archive/archive-tests.factor  | 17 +++++++++++++++++
 extra/mason/release/archive/archive.factor      | 11 ++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 extra/mason/release/archive/archive-tests.factor

diff --git a/extra/mason/release/archive/archive-tests.factor b/extra/mason/release/archive/archive-tests.factor
new file mode 100644
index 0000000000..16be1522cf
--- /dev/null
+++ b/extra/mason/release/archive/archive-tests.factor
@@ -0,0 +1,17 @@
+USING: system tools.test ;
+
+IN: mason.release.archive
+
+{ ".dmg" } [ macosx extension ] unit-test
+{ ".dmg" } [ "macosx" extension ] unit-test
+
+{ ".zip" } [ windows extension ] unit-test
+{ ".zip" } [ "windows" extension ] unit-test
+
+{ ".tar.gz" } [ unix extension ] unit-test
+{ ".tar.gz" } [ "unix" extension ] unit-test
+
+{ ".tar.gz" } [ linux extension ] unit-test
+{ ".tar.gz" } [ "linux" extension ] unit-test
+
+{ ".tar.gz" } [ f extension ] unit-test
diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor
index a58d21f544..ef67a9faeb 100644
--- a/extra/mason/release/archive/archive.factor
+++ b/extra/mason/release/archive/archive.factor
@@ -1,18 +1,19 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators locals io.directories
+USING: accessors arrays combinators locals io.directories
 io.directories.hierarchy io.files io.launcher io.pathnames
 kernel make mason.common mason.config mason.platform namespaces
-prettyprint sequences system ;
+prettyprint sequences system words ;
 IN: mason.release.archive
 
 : base-name ( -- string )
     [ "factor-" % platform % "-" % stamp get % ] "" make ;
 
 : extension ( os -- extension )
+    dup word? [ name>> ] when
     {
-        { windows [ ".zip" ] }
-        { macosx [ ".dmg" ] }
+        { "windows" [ ".zip" ] }
+        { "macosx" [ ".dmg" ] }
         [ drop ".tar.gz" ]
     } case ;
 
@@ -44,4 +45,4 @@ IN: mason.release.archive
     builds-dir get "releases" append-path dup make-directories ;
 
 : save-archive ( archive-name -- )
-    releases move-file-into ;
\ No newline at end of file
+    releases move-file-into ;