Fix the apt-proxy bypass.

This commit is contained in:
Cyteen May 2020-02-25 00:05:02 +00:00
parent f7f4657062
commit b82838535a
4 changed files with 38 additions and 31 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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