fixes

blocks wheezy and older, and precise. set to only remove xserver-xorg-legacy on specified releases.
leanstartpad · Jul 8, 2017 · e03c965 · e03c965
1 parent 08f0c72
commit e03c965
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/targets/kodi b/targets/kodi
@@ -2,6 +2,14 @@
 # Copyright (c) 2016 The crouton Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+if [ "${TARGETNOINSTALL:-c}" = 'c' ]; then
+    if release -le wheezy; then
+        error 99 "Kodi not supported on Debian Wheezy or older."
+    fi
+    if release = precise; then
+        error 99 "Kodi not supported on Precise Ubuntu."
+    fi
+fi
 REQUIRES='x11'
 PROVIDES='xbmc'
 DESCRIPTION='Installs the KODI media player. Ubuntu Only. (Approx. 140MB)'
@@ -11,8 +19,9 @@ CHROOTETC='kodi-keyboard.xml kodi-cycle.py'
 
 ### Append to prepare.sh:
 
+## Debian Overrides
 # Kodi wiki recommends using the Jessie Backports repository
-if release -le jessie; then
+if release = jessie; then
     cat > '/etc/apt/sources.list.d/kodi.list' <<EOF
 # Bring in Jessie Backports for newer Kodi
 deb http://http.debian.net/debian jessie-backports main
@@ -21,6 +30,12 @@ EOF
     apt-get update || true
 fi
 
+# Get rid of disruptive xserver-xorg-legacy package
+if release = stretch || release = sid || release = kali-rolling; then
+    remove xserver-xorg-legacy
+fi
+
+## Ubuntu Overrides
 # Kodi has an official ppa for the latest stable version
 if [ "$DISTRO" = 'ubuntu' ]; then    
     # Pull in the signing key
@@ -37,7 +52,6 @@ EOF
 fi
 
 install kodi pulseaudio
-remove xserver-xorg-legacy
 
 # Configure keymaps kodi for the hotkeys ctr-shift-alt F1/F2 to
 # cycle through chroots/chromeos. We use ~/.kodi/userdata/keymaps/keyboard.xml