From df8d837514cc5784579b7000827cf5c06808b103 Mon Sep 17 00:00:00 2001
From: fatalerrors <geoffray.levasseurbrandin@numericable.fr>
Date: Fri, 2 Jul 2021 16:48:59 +0200
Subject: [PATCH] added chromium installation (no snap), target filename fix
 (install_pkg)

---
 conf/init.conf.sh              |  2 +-
 modules/install_chromium.sh    | 33 +++++++++++++++++++++++++++++++++
 modules/install_pkg.sh         |  2 +-
 repo/common/apt_chromium.conf  | 16 ++++++++++++++++
 repo/common/debian_buster.list |  5 +++++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 modules/install_chromium.sh
 create mode 100644 repo/common/apt_chromium.conf
 create mode 100644 repo/common/debian_buster.list

diff --git a/conf/init.conf.sh b/conf/init.conf.sh
index 0c08ce1..473febc 100644
--- a/conf/init.conf.sh
+++ b/conf/init.conf.sh
@@ -65,4 +65,4 @@ export FORCEBLANK=false
 
 # Liste des modules à executer (surchargeable en ligne de commande)
 export MODULE_LIST="upgrade_dist conf_disks conf_locale conf_ntp conf_ssh \
-		 install_desktop install_pkg"
+		 install_desktop install_pkg install_chromium"
diff --git a/modules/install_chromium.sh b/modules/install_chromium.sh
new file mode 100644
index 0000000..175e682
--- /dev/null
+++ b/modules/install_chromium.sh
@@ -0,0 +1,33 @@
+# Since Ubuntu install snapd version of Chromium and we don't want that
+# we need a special procedure to install Debian Buster version.
+# Consequently that module is *Ubuntu centric.
+
+export VER_install_chromium="0.0.1"
+
+install_chromium()
+{
+    # Add Debian Buster repo to sources.list.d directory
+    installfile debian_buster.dist /etc/apt/sources.list.d/
+    
+    # Install Debian GPG keys
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A
+    
+    # Install package manager conf file for Chromium
+    installfile apt_chromium.conf /etc/apt/preferences.d/
+    
+    # Update package list and install
+    pkgupt
+    pkginst chromium
+}
+
+precheck_install_chromium()
+{
+    # Nothing to check
+    :
+}
+
+export -f install_chromium
+export -f precheck_install_chromium
diff --git a/modules/install_pkg.sh b/modules/install_pkg.sh
index f871669..a02a352 100644
--- a/modules/install_pkg.sh
+++ b/modules/install_pkg.sh
@@ -11,7 +11,7 @@ install_pkg()
     if [[ -n PKGS_BLACKLIST ]]; then
         for pkg in $PKGS_BLACKLIST; do
             prnt I "Mise du paquet $pkg en liste noire..."
-            local dest=/usr/apt/apt.conf.d/blacklist_$pkg.conf
+            local dest=/usr/apt/preferences.d/blacklist_$pkg.conf
             installfile blacklist.conf $dest &&
                 sed -i -e "s/@pkg@/pkg/" $dest
         done
diff --git a/repo/common/apt_chromium.conf b/repo/common/apt_chromium.conf
new file mode 100644
index 0000000..0abe689
--- /dev/null
+++ b/repo/common/apt_chromium.conf
@@ -0,0 +1,16 @@
+ # Note: 2 blank lines are required between entries
+ Package: *
+ Pin: release a=eoan
+ Pin-Priority: 500
+
+ 
+ Package: *
+ Pin: origin "ftp.debian.org"
+ Pin-Priority: 300
+
+ 
+ # Pattern includes 'chromium', 'chromium-browser' and similarly
+ # named dependencies:
+ Package: chromium*
+ Pin: origin "ftp.debian.org"
+ Pin-Priority: 700
diff --git a/repo/common/debian_buster.list b/repo/common/debian_buster.list
new file mode 100644
index 0000000..cd792be
--- /dev/null
+++ b/repo/common/debian_buster.list
@@ -0,0 +1,5 @@
+ # Basic Debian Buster repositories
+ 
+ deb http://deb.debian.org/debian buster main
+ deb http://deb.debian.org/debian buster-updates main
+ deb http://deb.debian.org/debian-security buster/updates main