diff --git a/020_brave_browser-beta.sh b/020_brave_browser-beta.sh index b597538..975f4e2 100755 --- a/020_brave_browser-beta.sh +++ b/020_brave_browser-beta.sh @@ -4,23 +4,25 @@ UBUNTU_CODENAME=bionic BRANCH="-beta" URL="brave-browser-apt${BETA}.s3.brave.com" -curl -s https://${URL}/brave-core${BRANCH}.asc | sudo apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser${BRANCH}.gpg add - +curl -s https://${URL}/brave-core${BRANCH}.asc | apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser${BRANCH}.gpg add - -echo "deb [arch=amd64] https://${URL}/ ${UBUNTU_CODENAME} main" | sudo tee /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +echo "deb [arch=amd64] https://${URL}/ ${UBUNTU_CODENAME} main" | tee /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list -sudo ln -sf /etc/apt/sources.list-available/brave-browser-beta-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list -sudo apt update +ln -sf /etc/apt/sources.list-available/brave-browser-beta-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +apt update -sudo apt install brave-browser${BRANCH} +apt install brave-browser${BRANCH} echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf -service procps restart +#service procps restart # Bypass apt-proxy for brave packages -if [ ! -f /etc/apt/apt.conf.d/02proxy ]; then - mkdir /etc/apt/apt.conf.d/02proxy +if [ -f /etc/apt/apt.conf.d/02proxy ]; then + cat /etc/apt/apt.conf.d/02proxy if [ ! -z $(grep ${URL}) ]; then - echo "Acquire::http::Proxy { ${URL} DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi +else + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi diff --git a/020_brave_browser-dev.sh b/020_brave_browser-dev.sh index 3c1ed3b..e964822 100755 --- a/020_brave_browser-dev.sh +++ b/020_brave_browser-dev.sh @@ -16,12 +16,13 @@ sudo apt update sudo apt install brave-browser${BRANCH} echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf -service procps restart +#service procps restart # Bypass apt-proxy for brave packages -if [ ! -d /etc/apt/apt.conf.d/02proxy ]; then - mkdir /etc/apt/apt.conf.d/02proxy +if [ -d /etc/apt/apt.conf.d/02proxy ]; then if [ ! -z $(grep ${URL}) ]; then - echo "Acquire::http::Proxy { ${URL} DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi +else + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi diff --git a/020_brave_browser-nightly.sh b/020_brave_browser-nightly.sh index 46519cc..339122b 100755 --- a/020_brave_browser-nightly.sh +++ b/020_brave_browser-nightly.sh @@ -4,24 +4,26 @@ UBUNTU_CODENAME=bionic BRANCH="-nightly" URL="brave-browser-apt${BRANCH}.s3.brave.com" -curl -s https://${URL}/brave-core${BRANCH}.asc | sudo apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser${BRANCH}.gpg add - +curl -s https://${URL}/brave-core${BRANCH}.asc | apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser${BRANCH}.gpg add - -echo "deb [arch=amd64] https://${URL}/ $UBUNTU_CODENAME main" | sudo tee /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +echo "deb [arch=amd64] https://${URL}/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list -sudo ln -s /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +ln -s /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list -sudo apt update +apt update -sudo apt install brave-browser${BRANCH} +apt install brave-browser${BRANCH} echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf -service procps restart +#service procps restart # Bypass apt-proxy for brave packages -if [ ! -f /etc/apt/apt.conf.d/02proxy ]; then - mkdir /etc/apt/apt.conf.d/02proxy +if [ -f /etc/apt/apt.conf.d/02proxy ]; then + cat /etc/apt/apt.conf.d/02proxy if [ ! -z $(grep ${URL}) ]; then - echo "Acquire::http::Proxy { ${URL} DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi +else + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi diff --git a/020_brave_browser.sh b/020_brave_browser.sh index 4672dff..401297d 100755 --- a/020_brave_browser.sh +++ b/020_brave_browser.sh @@ -3,23 +3,25 @@ UBUNTU_CODENAME=bionic URL="brave-browser-apt-release.s3.brave.com" -curl -s https://${URL}/brave-core.asc | sudo apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add - +curl -s https://${URL}/brave-core.asc | apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add - -echo "deb [arch=amd64] https://${URL} ${UBUNTU_CODENAME} main" | sudo tee /etc/apt/sources.list-available/brave-browser.list +echo "deb [arch=amd64] https://${URL} ${UBUNTU_CODENAME} main" | tee /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 +ln -sf /etc/apt/sources.list-available/brave-browser.list /etc/apt/sources.list.d/brave-browser.list -sudo apt update +apt update -sudo apt install -y brave-browser brave-keyring +apt install -y brave-browser brave-keyring echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf -service procps restart +#service procps restart # Bypass apt-proxy for brave packages -if [ ! -f /etc/apt/apt.conf.d/02proxy ]; then - mkdir /etc/apt/apt.conf.d/02proxy +if [ -f /etc/apt/apt.conf.d/02proxy ]; then + cat /etc/apt/apt.conf.d/02proxy if [ ! -z $(grep ${URL}) ]; then - echo "Acquire::http::Proxy { ${URL} DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi +else + echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi