crostini: update for Debian 13

diff --git a/.bin/crostini-vapier-setup b/.bin/crostini-vapier-setup
index 63113f6a561f95d435771fba4aa64cf2623d7ef9..1acd3e6b6711de062b9c9988ae1c0071ae6cbf64 100755 (executable)
--- a/.bin/crostini-vapier-setup
+++ b/.bin/crostini-vapier-setup
@@ -11,7 +11,7 @@ fi
 
 pkgs=(
        ipython3
 
 pkgs=(
        ipython3

-       pylint3
+       pylint

        python3-bs4
        python3-dev
        python3-pip
        python3-bs4
        python3-dev
        python3-pip


@@ -33,9 +33,10 @@ pkgs=(
        optipng
        pngcrush
        sshfs
        optipng
        pngcrush
        sshfs

-       steam
+       # steam

        xournal
 
        xournal
 

+       7zip

        autoconf
        autoconf-archive
        automake
        autoconf
        autoconf-archive
        automake


@@ -49,20 +50,22 @@ pkgs=(
        dejagnu
        diffstat
        dnsutils
        dejagnu
        diffstat
        dnsutils

+       file

        flex
        flex

+       g++

        gcc
        gdb
        gettext
        gcc
        gdb
        gettext

-       g++

        git
        git-email
        git-svn
        gnupg
        keychain
        libtool
        git
        git-email
        git-svn
        gnupg
        keychain
        libtool

+       man-db

        mosh
        nano
        mosh
        nano

-       netcat
+       netcat-traditional

        ninja-build
        patchutils
        pax-utils
        ninja-build
        patchutils
        pax-utils


@@ -72,13 +75,14 @@ pkgs=(
        strace
        subversion
        texinfo
        strace
        subversion
        texinfo

+       tmux

        tree
        tree

-       unrar
+       unrar-free

        unzip
        vim
        zip
 
        unzip
        vim
        zip
 

-       openjdk-11-jre-headless
+       #openjdk-11-jre-headless

 
        device-tree-compiler
        libcap-dev
 
        device-tree-compiler
        libcap-dev


@@ -98,18 +102,39 @@ pkgs=(
 printf "Defaults !tty_tickets\nDefaults timestamp_timeout=360\n" >/etc/sudoers.d/vapier
 chmod 440 /etc/sudoers.d/vapier
 
 printf "Defaults !tty_tickets\nDefaults timestamp_timeout=360\n" >/etc/sudoers.d/vapier
 chmod 440 /etc/sudoers.d/vapier
 

-# Add non-free sources for Steam.
+# Add non-free sources.

 sed -i "/^deb .*\/debian .* main$/s:$: contrib non-free:" /etc/apt/sources.list
 dpkg --add-architecture i386
 
 sed -i "/^deb .*\/debian .* main$/s:$: contrib non-free:" /etc/apt/sources.list
 dpkg --add-architecture i386
 

-curl -s "https://dl-ssl.google.com/linux/linux_signing_key.pub" | apt-key add -
-echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google-chrome.list
-
-curl -s "https://packages.cloud.google.com/apt/doc/apt-key.gpg" | apt-key add -
-echo "deb [arch=amd64] https://packages.cloud.google.com/apt cloud-sdk main" >/etc/apt/sources.list.d/google-cloud-sdk.list
-
-curl -s "https://packages.microsoft.com/keys/microsoft.asc" | apt-key add -
-echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" >/etc/apt/sources.list.d/microsoft-edge.list
+add_repo() {
+       local name=$1 key=$2 repo=$3
+       if type -P apt-key ; then
+               # Old Debian systems.
+               curl -s "${key}" | apt-key add -
+               echo "deb [arch=amd64] ${repo}" > /etc/apt/sources.list.d/${name}.list
+       else
+               # New Debian systems (13+).
+               local keypath="/etc/apt/keyrings/${name}.gpg"
+               mkdir -p /etc/apt/keyrings
+               curl -s "${key}" | gpg --dearmor -o - > "${keypath}"
+               echo "deb [arch=amd64 signed-by=${keypath}] ${repo}" > /etc/apt/sources.list.d/${name}.list
+       fi
+}
+
+add_repo \
+       google-chrome \
+       "https://dl-ssl.google.com/linux/linux_signing_key.pub" \
+       "https://dl.google.com/linux/chrome/deb/ stable main"
+
+add_repo \
+       google-cloud-sdk \
+       "https://packages.cloud.google.com/apt/doc/apt-key.gpg" \
+       "https://packages.cloud.google.com/apt cloud-sdk main"
+
+add_repo \
+       microsoft-edge-dev \
+       "https://packages.microsoft.com/keys/microsoft.asc" \
+       "https://packages.microsoft.com/repos/edge stable main"

 
 apt-get update
 apt-get -y dist-upgrade
 
 apt-get update
 apt-get -y dist-upgrade