Merge 49f8cc0 into 5531d10

gisce · Nov 11, 2016 · cc9f2f3 · cc9f2f3
2 parents 5531d10 + 49f8cc0
commit cc9f2f3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/hookshub/hooks/github/pull_request-powerp-docs.py b/hookshub/hooks/github/pull_request-powerp-docs.py
@@ -132,6 +132,15 @@ def arguments():
         exit(1)
     output += '{} OK |'.format(out)
 
+    # CP landing page (if exists)
+    from os.path import isdir
+    landing_dir = join(clone_dir, 'landing_page')
+    if isdir(landing_dir):
+        from os import listdir
+        from shutil import copyfile
+        for item in listdir(landing_dir):
+            copyfile(join(landing_dir, item), join(util_docs_path, item))
+
     output += ' Writting comment on PR ...'
 
     # Construim el comentari:
@@ -141,13 +150,15 @@ def arguments():
         branch_name
     )
     if port in ['80', '443']:
-        res_url = '{0}/ca/{1}'.format(base_url, base_uri)
+        res_url = '{0}/'.format(base_url)
+        res_url_ca = '{0}/ca/{1}'.format(base_url, base_uri)
         res_url_es = '{0}/es/{1}'.format(base_url, base_uri)
     else:
-        res_url = '{0}:{1}/ca/{2}'.format(base_url, port, base_uri)
+        res_url = '{0}:{1}/'.format(base_url, port)
+        res_url_ca = '{0}:{1}/ca/{2}'.format(base_url, port, base_uri)
         res_url_es = '{0}:{1}/es/{2}'.format(base_url, port, base_uri)
-    comment = 'Documentation build URL:\n'
-    comment += 'ca_ES: http://{}/\n'.format(res_url)
+    comment = 'Documentation build URL: {}\n'.format(res_url)
+    comment += 'ca_ES: http://{}/\n'.format(res_url_ca)
     comment += 'es_ES: http://{}/'.format(res_url_es)
 
     # Postejem el comentari

diff --git a/hookshub/hooks/github/push-powerp-docs.py b/hookshub/hooks/github/push-powerp-docs.py
@@ -124,6 +124,15 @@ def arguments():
         exit(1)
     output += '{} OK |'.format(out)
 
+    # CP landing page (if exists)
+    from os.path import isdir
+    landing_dir = join(clone_dir, 'landing_page')
+    if isdir(landing_dir):
+        from os import listdir
+        from shutil import copyfile
+        for item in listdir(landing_dir):
+            copyfile(join(landing_dir, item), join(util_docs_path, item))
+
     output += ' Writting comment on PR ...'
 
     # Construim el comentari:
@@ -133,13 +142,15 @@ def arguments():
         branch_name
     )
     if port in ['80', '443']:
-        res_url = '{0}/ca/{1}'.format(base_url, base_uri)
+        res_url = '{0}/'.format(base_url)
+        res_url_ca = '{0}/ca/{1}'.format(base_url, base_uri)
         res_url_es = '{0}/es/{1}'.format(base_url, base_uri)
     else:
-        res_url = '{0}:{1}/ca/{2}'.format(base_url, port, base_uri)
+        res_url = '{0}:{1}/'.format(base_url, port)
+        res_url_ca = '{0}:{1}/ca/{2}'.format(base_url, port, base_uri)
         res_url_es = '{0}:{1}/es/{2}'.format(base_url, port, base_uri)
-    comment = 'Documentation build URL:\n'
-    comment += 'ca_ES: http://{}/\n'.format(res_url)
+    comment = 'Documentation build URL: {}\n'.format(res_url)
+    comment += 'ca_ES: http://{}/\n'.format(res_url_ca)
     comment += 'es_ES: http://{}/'.format(res_url_es)
 
     # Necessitem agafar totes les pull request per trobar la nostra