From 0e2fcaa4a6b9c9ee5568be13a26e78791231b7e4 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 16 Nov 2019 16:36:21 +0100
Subject: [PATCH] Revert "[fix] Try something to be independent from github"

---
 src/js/yunohost/controllers/apps.js | 6 ++++--
 src/views/app/app_list_install.ms   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index ef2cb3f6..17c91e10 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -578,6 +578,7 @@
         }
     });
 
+    // Install custom app from github
     app.post('#/apps/install/custom', function(c) {
 
         var params = {
@@ -594,9 +595,10 @@
 
                 // Force trailing slash
                 params.app = params.app.replace(/\/?$/, '/');
-                var giturl  = params.app + "raw/master/manifest.json";
+
+                // Get manifest.json to get additional parameters
                 jQuery.ajax({
-                    url: giturl,
+                    url: params.app.replace('github.com', 'raw.githubusercontent.com') + 'master/manifest.json',
                     type: 'GET',
                 })
                 .done(function(manifest) {
diff --git a/src/views/app/app_list_install.ms b/src/views/app/app_list_install.ms
index 06d9d038..e0ce26b0 100644
--- a/src/views/app/app_list_install.ms
+++ b/src/views/app/app_list_install.ms
@@ -73,7 +73,7 @@
             <div class="form-group has-feedback">
                 <label for="url" class="col-sm-12">{{t 'url'}}</label>
                 <div class="col-sm-12">
-                    <input type="url" id="url" name="url" class="form-control" value="" placeholder="https://GITHOST.TLD/USER/(...)/REPOSITORY" required>
+                    <input type="url" id="url" name="url" class="form-control" value="" placeholder="https://github.com/USER/REPOSITORY" required pattern="^https://github.com/[a-zA-Z0-9-_.]+/[a-zA-Z0-9-_.]+[/]?$">
                     <p class="text-warning">
                         <span class="fa-github"></span> {{t 'custom_app_url_only_github'}}
                     </p>