Add bypass for 02proxy.
This commit is contained in:
parent
debade1068
commit
4fbad0f768
14
020_mkusb.sh
14
020_mkusb.sh
|
|
@ -4,6 +4,7 @@
|
|||
# 18.04 bionic buster
|
||||
# 17.10 artful stretch
|
||||
|
||||
URL=ppa.launchpad.net
|
||||
RELEASE=bionic
|
||||
APP=mkusb
|
||||
VERSION=unstable # ppa
|
||||
|
|
@ -17,11 +18,20 @@ packages="
|
|||
fdisk \
|
||||
"
|
||||
|
||||
sudo echo "deb http://ppa.launchpad.net/${APP}/${VERSION}/ubuntu ${RELEASE} main" > /etc/apt/sources.list-available/mkusb-ppa.list
|
||||
sudo echo "deb-src http://ppa.launchpad.net/${APP}/${VERSION}/ubuntu ${RELEASE} main" >> /etc/apt/sources.list-available/mkusb-ppa.list
|
||||
sudo echo "deb http:/${URL}/${APP}/${VERSION}/ubuntu ${RELEASE} main" > /etc/apt/sources.list-available/mkusb-ppa.list
|
||||
sudo echo "deb-src http://${URL}/${APP}/${VERSION}/ubuntu ${RELEASE} main" >> /etc/apt/sources.list-available/mkusb-ppa.list
|
||||
|
||||
sudo ln -sf /etc/apt/sources.list-available/mkusb-ppa.list /etc/apt/sources.list.d/mkusb-ppa.list
|
||||
|
||||
# Bypass apt-proxy for mkusb packages
|
||||
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
|
||||
fi
|
||||
else
|
||||
echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
|
||||
fi
|
||||
|
||||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 54B8C8AC
|
||||
|
||||
sudo apt-get update
|
||||
|
|
|
|||
|
|
@ -1,11 +1,24 @@
|
|||
#!/usr/bin/env bash
|
||||
sudo sh -c "echo 'deb https://riot.im/packages/debian/ buster main' > /etc/apt/sources.list-available/matrix-riot-im.list"
|
||||
#!/usr/bin/env basho
|
||||
|
||||
URL=riot.im
|
||||
RELEASE=buster
|
||||
|
||||
sudo sh -c "echo 'deb https://${URL}/packages/debian/ ${RELEASE} main' > /etc/apt/sources.list-available/matrix-riot-im.list"
|
||||
|
||||
sudo ln -s /etc/apt/sources.list-available/matrix-riot-im.list /etc/apt/sources.list.d/matrix-riot-im.list
|
||||
|
||||
# Add the public key:
|
||||
curl -L https://riot.im/packages/debian/repo-key.asc | sudo apt-key add -
|
||||
|
||||
# Bypass apt-proxy for riotIM packages
|
||||
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
|
||||
fi
|
||||
else
|
||||
echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
|
||||
fi
|
||||
|
||||
sudo apt-get update && apt-get -y install riot-nightly
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,25 @@
|
|||
#!/usr/bin/env bash
|
||||
sudo sh -c "echo 'deb https://riot.im/packages/debian/ buster main' > /etc/apt/sources.list-available/matrix-riot-im.list"
|
||||
|
||||
URL=riot.im
|
||||
RELEASE=buster
|
||||
|
||||
|
||||
sudo sh -c "echo 'deb https://${URL}.im/packages/debian/ ${RELEASE} main' > /etc/apt/sources.list-available/matrix-riot-im.list"
|
||||
|
||||
sudo ln -s /etc/apt/sources.list-available/matrix-riot-im.list /etc/apt/sources.list.d/matrix-riot-im.list
|
||||
|
||||
# Add the public key:
|
||||
curl -L https://riot.im/packages/debian/repo-key.asc | sudo apt-key add -
|
||||
|
||||
# Bypass apt-proxy for riotIM packages
|
||||
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
|
||||
fi
|
||||
else
|
||||
echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
|
||||
fi
|
||||
|
||||
sudo apt-get update && apt-get -y install riot-web
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -397,9 +397,6 @@ au BufRead, BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/lib
|
|||
|
||||
EOF
|
||||
|
||||
|
||||
cat ${DEST}/.vimrc_pending
|
||||
|
||||
# append the existing vimrc to the plugin additions
|
||||
cat ${DEST}/.vimrc >> ${DEST}/.vimrc_pending
|
||||
|
||||
|
|
@ -408,7 +405,7 @@ cp ${DEST}/.vimrc_pending ${DEST}/.vimrc
|
|||
#mv ${DEST}/.vimrc_pending ${DEST}/.vimrc
|
||||
|
||||
# Install Vundle plugins
|
||||
HOME=${DEST} vim -V -E -s -c "source ${DEST}/.vimrc" -c "PluginInstall" -c "PluginUpdate" -c "qa\!"
|
||||
HOME=${DEST} vim -V -E -s -c "source ${DEST}/.vimrc" -c "PluginInstall" -c "PluginUpdate" -c "qa!"
|
||||
|
||||
# Install Coc plugins FIXME
|
||||
#HOME=${DEST} vim -V -E -s -c "source ${DEST}/.vimrc" -c "CocInstall coc-java coc-go coc-python coc-flutter coc-css coc-cssmodules coc-xml coc-json coc-yaml coc-html coc-git coc-docker" -c "qa\!"
|
||||
|
|
|
|||
Loading…
Reference in New Issue