Merge pull request #16 from Ulauncher/debian-clarifications

Debian clarifications
Ulauncher · Jul 2, 2022 · 5229d67 · 5229d67
2 parents eebff10 + adc05ea
commit 5229d67
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/_includes/index/releases.html b/_includes/index/releases.html
@@ -21,11 +21,16 @@
                 <b class="distro-name">Ubuntu (Debian)</b> <span id="release-deb"><i>loading link...</i></span>
             </p>
 
-            Install via PPA:<br />
+            Install via PPA (Ubuntu):<br />
             <p id="ubuntu-ppa"></p>
 
+            <details style="margin-bottom: 15px;">
+                <summary><em>Note that the above instructions are specifically for Ubuntu. For Debian instructions, click here to expand.</em></summary>
+                <div id="debian-ppa"></div>
+            </details>
+
             Alternatively, you can download the <code>.deb</code> file and run:<br />
-            <code>sudo apt install ./ulauncher_x.y.z_all.deb</code> or just double click.<br>
+            <code>sudo apt install ./ulauncher_x.y.z_all.deb</code> or right click and choose to open in your graphical installer (normally named "Software").<br>
         </li>
         <li class="distro-icon distro-archlinux">
             <p>

diff --git a/assets/js/releases.js b/assets/js/releases.js
@@ -62,9 +62,18 @@ jQuery(function($) {
                 'git clone https://aur.archlinux.org/ulauncher-git.git && cd ulauncher-git && makepkg -is';
             $('#aur-shell').html(aurShell);
 
-            var ubuntuPpa = selectStable ? '<code>sudo add-apt-repository ppa:agornostal/ulauncher && sudo apt update && sudo apt install ulauncher</code>' :
-                '<code>sudo add-apt-repository ppa:agornostal/ulauncher-dev && sudo apt update && sudo apt install ulauncher</code>';
-            $('#ubuntu-ppa').html(ubuntuPpa);
+            var launchpadPackage = selectStable ? 'ulauncher' : 'ulauncher-dev';
+            $('#ubuntu-ppa').html('<code>sudo add-apt-repository ppa:agornostal/' + launchpadPackage + ' && sudo apt update && sudo apt install ulauncher</code>');
+
+            var debianInstructions = 'sudo apt update && sudo apt install -y gnupg\n' +
+                'gpg --keyserver keyserver.ubuntu.com --recv 0xfaf1020699503176\n' +
+                'gpg --export 0xfaf1020699503176 | sudo tee /usr/share/keyrings/ulauncher-archive-keyring.gpg\n' +
+                'sudo echo "deb [signed-by=/usr/share/keyrings/ulauncher-archive-keyring.gpg] \\\n' +
+                '          http://ppa.launchpad.net/agornostal/' + launchpadPackage + '/ubuntu focal main" \\\n' +
+                '          > /etc/apt/sources.list.d/' + launchpadPackage + '-focal.list\n' +
+                'sudo apt update && sudo apt install ulauncher';
+
+            $('#debian-ppa').html("<pre>" + debianInstructions + "</pre>");
 
             renderReleaseLinks(selectStable ? stable : dev);
         }