Merge branch 'master' of factorcode.org:/git/factor

extra/mason/version/files/files.factor

@@ -10,9 +10,6 @@ IN: mason.version.files
 : remote-directory ( string -- string' )
     [ upload-directory get ] dip "/" glue ;
 
-: remote ( string version -- string )
-    remote-directory swap "/" glue ;
-
 : platform ( builder -- string )
     [ os>> ] [ cpu>> ] bi (platform) ;
 
@@ -30,10 +27,10 @@ IN: mason.version.files
     ] [ drop ] 2bi release-directory ;
 
 : remote-binary-release-name ( version builder -- string )
-    [ binary-release-name ] [ drop ] 2bi remote ;
+    binary-release-name remote-directory ;
 
 : source-release-name ( version -- string )
     [ "factor-src-" ".zip" surround ] keep release-directory ;
 
 : remote-source-release-name ( version -- string )
-    [ source-release-name ] keep remote ;
+    source-release-name remote-directory ;

extra/mason/version/version.factor

@@ -13,7 +13,7 @@ IN: mason.version
 
 : make-release-directory ( version -- )
     "Creating release directory..." print flush
-    [ "mkdir -p " % "" release-directory % "\n" % ] "" make
+    [ "mkdir -p " % "" release-directory remote-directory % "\n" % ] "" make
     execute-on-server ;
 
 : tweet-release ( version announcement-url -- )

extra/webapps/mason/make-release/make-release.factor

@@ -6,7 +6,12 @@ IN: webapps.mason.make-release
 
 : <make-release-action> ( -- action )
     <page-action>
-    [ { { "version" [ v-one-line ] } } validate-params ] >>validate
+    [
+        {
+            { "version" [ v-one-line ] }
+            { "announcement-url" [ v-url ] }
+        } validate-params
+    ] >>validate
     [
         [
             "version" value "announcement-url" value do-release