From b2e46e834ebfa0de5b886556f1a13e21ad0cdd08 Mon Sep 17 00:00:00 2001
From: Cyteen May <cyteen@ring-zero.co.uk>
Date: Sun, 16 Feb 2020 04:16:57 +0000
Subject: [PATCH] Fix the sources lists.

---
 020_brave_browser-beta.sh    |  7 +++++--
 020_brave_browser-dev.sh     |  7 ++++---
 020_brave_browser-nightly.sh |  7 ++++---
 020_brave_browser.sh         | 12 ++++++------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/020_brave_browser-beta.sh b/020_brave_browser-beta.sh
index 67e2293..57a3206 100755
--- a/020_brave_browser-beta.sh
+++ b/020_brave_browser-beta.sh
@@ -4,11 +4,14 @@ curl -s https://brave-browser-apt-beta.s3.brave.com/brave-core-nightly.asc | sud
 #source /etc/os-release
 UBUNTU_CODENAME=bionic
 
-echo "deb [arch=amd64] https://brave-browser-apt-beta.s3.brave.com/ $UBUNTU_CODENAME main" | sudo tee /etc/apt/sources.list.d/brave-browser-beta-${UBUNTU_CODENAME}.list
+echo "deb [arch=amd64] https://brave-browser-apt-beta.s3.brave.com/ ${UBUNTU_CODENAME} main" | sudo tee /etc/apt/sources.list-available/brave-browser-beta-${UBUNTU_CODENAME}.list
 
+sudo ln -sf /etc/apt/sources.list-available/brave-browser-beta-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser-beta-${UBUNTU_CODENAME}.list
 sudo apt update
 
+sudo apt install brave-browser-beta
+
 echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
 service procps restart
 
-sudo apt install brave-browser-beta
+
diff --git a/020_brave_browser-dev.sh b/020_brave_browser-dev.sh
index e58b699..44f2136 100755
--- a/020_brave_browser-dev.sh
+++ b/020_brave_browser-dev.sh
@@ -8,9 +8,10 @@ echo "deb [arch=amd64] https://brave-browser-apt-dev.s3.brave.com/ $UBUNTU_CODEN
 
 sudo ln -s /etc/apt/sources.list-available/brave-browser-dev-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser-dev-${UBUNTU_CODENAME}.list
 
-echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
-service procps restart
-
 sudo apt update
 
 sudo apt install brave-browser-dev
+
+echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
+service procps restart
+
diff --git a/020_brave_browser-nightly.sh b/020_brave_browser-nightly.sh
index 8313f7b..05dccef 100755
--- a/020_brave_browser-nightly.sh
+++ b/020_brave_browser-nightly.sh
@@ -8,9 +8,10 @@ echo "deb [arch=amd64] https://brave-browser-apt-nightly.s3.brave.com/ $UBUNTU_C
 
 sudo ln -s /etc/apt/sources.list-available/brave-browser-nightly-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser-nightly-${UBUNTU_CODENAME}.list
 
-echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
-service procps restart
-
 sudo apt update
 
 sudo apt install brave-browser-nightly
+
+echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
+service procps restart
+
diff --git a/020_brave_browser.sh b/020_brave_browser.sh
index 5dc670b..86055f5 100755
--- a/020_brave_browser.sh
+++ b/020_brave_browser.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
-RELEASE=bionic
+UBUNTU_CODENAME=bionic
 echo ${RELEASE}
 curl -s https://brave-browser-apt-release.s3.brave.com/brave-core.asc | sudo apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add -
 
-sudo sh -c "echo "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com ${RELEASE} main" >> /etc/apt/sources.list-available/brave-browser.list"
+echo "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com ${UBUNTU_CODENAME} main" >> /etc/apt/sources.list-available/brave-browser.list
 
 sudo ln -sf /etc/apt/sources.list-available/brave-browser.list /etc/apt/sources.list.d/brave-browser.list
 
-echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
-service procps restart
-
-
 sudo apt update
 
 sudo apt install brave-browser brave-keyring
+
+echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
+service procps restart
+