Merge ~sylvain-pineau/checkbox-snappy/+git/checkbox-snappy-classic:interim_release_support into ~checkbox-dev/checkbox-snappy/+git/checkbox-snappy-classic:master

[Sylvain Pineau]

Patches required to make checkbox-snappy-classic compatible with interim releases.

Requires:

- https://code.launchpad.net/~sylvain-pineau/checkbox-core-snap/+git/checkbox-core-snap/+merge/401725
- https://code.launchpad.net/~sylvain-pineau/checkbox-ng/+git/checkbox-ng/+merge/401767

Unmerged commits

2066223... by Sylvain Pineau on 2021-04-26

wrapper_local: Move $PERL5LIB export after the $PATH adjustments

Otherwise perl is the one from the host not the snap and can't load extra
modules only available in the snap.

8c5502e... by Sylvain Pineau on 2021-04-26

hooks:install: Preserve sudoer include directive with the pound (#) character

To stay comptabible with older version of sudo that don't understand the @include.

See https://unix.stackexchange.com/questions/244064/why-are-the-include-and-includedir-directives-in-sudo-prefixed-with-the-pound

diff --git a/launchers/wrapper_local b/launchers/wrapper_local
index 6781ba4..a0d1d0a 100755
--- a/launchers/wrapper_local
+++ b/launchers/wrapper_local
@@ -28,12 +28,12 @@ if [ ! -d "$RUNTIME" ]; then
 fi
 
 export LC_ALL=C.UTF-8
-PERL_VERSION=$(perl -e '$^V=~/^v(\d+\.\d+)/;print $1')
-export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/$ARCH/perl5/$PERL_VERSION:$SNAP/usr/share/perl/$PERL_VERSION:$SNAP/usr/share/perl5"
 export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
 export PATH="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH"
 export ALSA_CONFIG_PATH=$SNAP/usr/share/alsa/alsa.conf:$SNAP/usr/share/alsa/pcm/default.conf
 export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
+PERL_VERSION=$(perl -e '$^V=~/^v(\d+\.\d+)/;print $1')
+export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/$ARCH/perl5/$PERL_VERSION:$SNAP/usr/share/perl/$PERL_VERSION:$SNAP/usr/share/perl5"
 
 if [ -e $RUNTIME/wrapper_common_classic ]; then
   . $RUNTIME/wrapper_common_classic
diff --git a/snap/hooks/install b/snap/hooks/install
index 1086fdc..fbc33e4 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -4,6 +4,7 @@ set -e
 snapctl set slave=enabled
 
 echo "ubuntu ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/checkbox
+sed -i 's|@includedir /etc/sudoers.d|#includedir /etc/sudoers.d|' /etc/sudoers
 
 mkdir -p /etc/polkit-1/localauthority/50-local.d
 cat <<EOF > /etc/polkit-1/localauthority/50-local.d/com.canonical.certification.checkbox.pkla