From 8614161578d24fb40b3bced1211eac24c74b5304 Mon Sep 17 00:00:00 2001 From: cyteen Date: Sat, 10 Oct 2020 18:47:41 +0100 Subject: [PATCH] Minor modifications. --- 001_apt-preferences.sh | 12 ++++-------- 001_apt-sources.sh | 12 ++++++------ 010_apt-get.sh | 3 +++ 020_arduino.sh | 2 +- 020_docker.sh | 5 ++++- 020_free42.sh | 2 +- 020_mpv.sh | 1 + 020_pbuilder.sh | 4 ++-- 020_waterfox.sh | 4 ++-- sbuild-devuan.sh | 2 +- sources.list.sh | 32 ++++++++++++++++---------------- 11 files changed, 41 insertions(+), 38 deletions(-) diff --git a/001_apt-preferences.sh b/001_apt-preferences.sh index fb65407..8a1f5b1 100755 --- a/001_apt-preferences.sh +++ b/001_apt-preferences.sh @@ -61,23 +61,19 @@ EOF cat > "/etc/apt/preferences.d/devuan.pref" << 'EOF' Package: * -Pin: origin "auto.mirror.devian.org" +Pin: origin "deb.devuan.org" Pin-Priority: 1001 Package: * -Pin: origin "packages.devuan.org" -Pin-Priority: 1001 - -Package: * -Pin: release a=jessie +Pin: release a=beowulf Pin-Priority:800 Package: * -Pin: release a=jessie-backports +Pin: release a=beowulf-backports Pin-Priority:750 Package: * -Pin: release a=ascii +Pin: release a=chimaera Pin-Priority:100 Package: * diff --git a/001_apt-sources.sh b/001_apt-sources.sh index ed20def..22037aa 100755 --- a/001_apt-sources.sh +++ b/001_apt-sources.sh @@ -21,8 +21,8 @@ echo ${#ACTIVE_LIST[@]} for RELEASE in "${ACTIVE_LIST[@]}"; do echo "${RELEASE}" bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" < ${AVAILABLE}/devuan_${RELEASE}.list" < ${AVAILABLE}/devuan_${RELEASE}.list" <> /etc/apt/sources.list.d/docker.list echo "#bash -c "curl -fsSL https://${URL}/linux/debian/gpg | apt-key add -"" > /etc/apt/sources.list-available/docker.list -echo "deb [arch=amd64] https://${URL}/linux/debian buster stable" >> /etc/apt/sources.list-available/docker.list +echo "deb https://${URL}/linux/debian buster stable" >> /etc/apt/sources.list-available/docker.list ln -sf /etc/apt/sources.list-available/docker.list /etc/apt/sources.list.d/docker.list #bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D" bash -c "curl -fsSL https://${URL}/linux/debian/gpg | apt-key add -" +bash -c "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7EA0A9C3F273FCD8" + + # Bypass apt-proxy for brave packages if [ -d /etc/apt/apt.conf.d/02proxy ]; then if [ ! -z $(grep ${URL}) ]; then diff --git a/020_free42.sh b/020_free42.sh index c725c5d..3a408e9 100755 --- a/020_free42.sh +++ b/020_free42.sh @@ -333,7 +333,7 @@ cd /usr/src apt install devscripts mk-build-deps free42-nologo --install --root-cmd sudo --remove -echo "deb-src http://pkgmaster.devuan.org/merged/ ceres main contrib non-free" >> /etc/apt/sources.list.d/ceres-temp.list +echo "deb-src http://deb.devuan.org/merged/ ceres main contrib non-free" >> /etc/apt/sources.list.d/ceres-temp.list apt source free42-nologo apt update rm /etc/apt/sources.list.d/ceres-temp.list diff --git a/020_mpv.sh b/020_mpv.sh index f12307b..e6a8a69 100755 --- a/020_mpv.sh +++ b/020_mpv.sh @@ -18,6 +18,7 @@ cat > ~/.config/mpv/mpv.conf<< 'EOF' #deband=no #volume-max=100 #hwdec=vaapi +ytdl-format=bestvideo[height<=?640][fps<=?30][vcodec!=?vp9]+bestaudio/best EOF # ## Quality over performance diff --git a/020_pbuilder.sh b/020_pbuilder.sh index c83f13c..9a9e3f0 100755 --- a/020_pbuilder.sh +++ b/020_pbuilder.sh @@ -96,7 +96,7 @@ UBUNTU_SUITES=("xenial" "wily" "vivid" "utopic" "trusty") # Mirrors to use. Update these to your preferred mirror. DEBIAN_MIRROR="deb.debian.org" UBUNTU_MIRROR="mirrors.kernel.org" -DEVUAN_MIRROR="pkgmaster.devuan.org" +DEVUAN_MIRROR="deb.devuan.org" # Optionally set a default distribution if none is used. Note that you can set # your own default (i.e. ${DIST:="unstable"}). @@ -182,6 +182,6 @@ EOF chmod +x ${HOOK_DIR}/D06deps #Update cow image on changes above -#DIST=${DIST} ARCH=${ARCH} git-pbuilder create --override-config --mirror http://pkgmaster.devuan.org +#DIST=${DIST} ARCH=${ARCH} git-pbuilder create --override-config --mirror http://deb.devuan.org DIST=${DIST} ARCH=${ARCH} git-pbuilder create diff --git a/020_waterfox.sh b/020_waterfox.sh index fefc125..7ccd564 100755 --- a/020_waterfox.sh +++ b/020_waterfox.sh @@ -26,9 +26,9 @@ apt update # waterfox-current-kpe - Free, open and private browser with better integration with KDE # waterfox-current-i18n-en-gb - English (British) language pack for Waterfox Current -apt install -y waterfox-classic-kpe waterfox-classic-i18n-en-gb +apt install -y waterfox-current-kpe waterfox-current-i18n-en-gb -update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-classic 201 +update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-current 201 # Stop white flash background in dark theme mode. # Add option toolkit.legacyUserProfileCustomizations.stylesheets to True. diff --git a/sbuild-devuan.sh b/sbuild-devuan.sh index 5d87aa3..c022087 100755 --- a/sbuild-devuan.sh +++ b/sbuild-devuan.sh @@ -4,7 +4,7 @@ LOGNAME=${USER} RELEASE=$(awk -F '/' \{'print $1'\} < /etc/devuan_version | awk '$1=$1') KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg INCLUDE="eatmydata,ccache,gnupg,debhelper,autotools-dev" -MIRROR=http://pkgmaster.devuan.org/merged +MIRROR=http://deb.devuan.org/merged apt install -y sbuild mkdir -p /root/.gnupg # To work around #792100 diff --git a/sources.list.sh b/sources.list.sh index 636bfd2..e21d377 100755 --- a/sources.list.sh +++ b/sources.list.sh @@ -5,8 +5,8 @@ cat > /etc/apt/sources.list.d/devuan-security.list < /etc/apt/sources.list.d/devuan-stable-updates.list < /etc/apt/sources.list.d/devuan-stable-proposed-updates.list < /etc/apt/sources.list.d/devuan-jessie-backports.list < /etc/apt/sources.list.d/devuan-experimental.list < /etc/apt/sources.list.d/devuan-ascii.list < /etc/apt/sources.list.d/devuan-ascii.list < /etc/apt/sources.list.d/devuan-ascii.list <